This way we have a single location in movenc which utilizes the
CPB properties.
---
libavformat/movenc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 5888d10770..a4ec4d05c9 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -4160,7 +4160,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;
- AVCPBProperties *props = NULL;
static const uint8_t uuid[] = {
0xa5, 0xd4, 0x0b, 0x30, 0xe8, 0x14, 0x11, 0xdd,
@@ -4186,6 +4185,8 @@ static int mov_write_isml_manifest(AVIOContext *pb,
MOVMuxContext *mov, AVFormat
for (i = 0; i < mov->nb_streams; i++) {
MOVTrack *track = &mov->tracks[i];
+ struct mpeg4_bit_rate_values bit_rates =
+ calculate_mpeg4_bit_rates(track);
const char *type;
int track_id = track->track_id;
char track_name_buf[32] = { 0 };
@@ -4201,12 +4202,10 @@ static int mov_write_isml_manifest(AVIOContext *pb,
MOVMuxContext *mov, AVFormat
continue;
}
- props = (AVCPBProperties*)av_stream_get_side_data(track->st,
AV_PKT_DATA_CPB_PROPERTIES, NULL);
-
if (track->par->bit_rate) {
manifest_bit_rate = track->par->bit_rate;
- } else if (props) {
- manifest_bit_rate = props->max_bitrate;
+ } else {
+ manifest_bit_rate = bit_rates.max_bit_rate;
}
avio_printf(pb, "<%s systemBitrate=\"%"PRId64"\">\n", type,
--
2.26.2
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
