diff options
| author | Jan Ekström <jeebjp@gmail.com> | 2020-09-20 19:55:14 +0300 |
|---|---|---|
| committer | Jan Ekström <jeebjp@gmail.com> | 2020-09-22 18:25:44 +0300 |
| commit | 519bd469d01af1727f943e5b73c964c94f29ccd0 (patch) | |
| tree | 5a7acc5496f025e1e10e93206e7be761607a5f29 /libavformat/movenc.c | |
| parent | 308882d9f2c6cc7159aba2ca7cdc99d07a9b531e (diff) | |
| download | ffmpeg-519bd469d01af1727f943e5b73c964c94f29ccd0.tar.gz | |
avformat/movenc: simplify ISML manifest bit rate logic
The newly calculated average bit rate value is pretty much what is
being done here.
Diffstat (limited to 'libavformat/movenc.c')
| -rw-r--r-- | libavformat/movenc.c | 13 |
1 files changed, 3 insertions, 10 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 860e331b19..20768cd45f 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -4209,7 +4209,6 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat { int64_t pos = avio_tell(pb); int i; - int64_t manifest_bit_rate = 0; static const uint8_t uuid[] = { 0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd, @@ -4252,15 +4251,9 @@ static int mov_write_isml_manifest(AVIOContext *pb, MOVMuxContext *mov, AVFormat continue; } - if (track->par->bit_rate) { - manifest_bit_rate = track->par->bit_rate; - } else { - manifest_bit_rate = bit_rates.max_bit_rate; - } - - avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type, - manifest_bit_rate); - param_write_int(pb, "systemBitrate", manifest_bit_rate); + avio_printf(pb, "<%s systemBitrate=\"%"PRIu32"\">\n", type, + bit_rates.avg_bit_rate); + param_write_int(pb, "systemBitrate", bit_rates.avg_bit_rate); param_write_int(pb, "trackID", track_id); param_write_string(pb, "systemLanguage", lang ? lang->value : "und"); |