aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2016-10-10 02:06:12 +0200
committerMichael Niedermayer <michael@niedermayer.cc>2016-12-05 18:29:12 +0100
commitb6b7034416073f65c00a70448d7c24430e1dc594 (patch)
tree122edd8320d9dde530c6ebb7d06cbecb5692ff8a
parentb7940ecb5a9467066f7c1228b059588f539807bf (diff)
downloadffmpeg-b6b7034416073f65c00a70448d7c24430e1dc594.tar.gz
avformat/isom: Fix old API regression with exporting max bitrate
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> (cherry picked from commit d88a6bedb9bc51eff35578a0b08d1088ee53bcda) Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r--libavformat/isom.c11
1 files changed, 8 insertions, 3 deletions
diff --git a/libavformat/isom.c b/libavformat/isom.c
index d412f06259..f6f000be61 100644
--- a/libavformat/isom.c
+++ b/libavformat/isom.c
@@ -487,9 +487,14 @@ int ff_mp4_read_dec_config_descr(AVFormatContext *fc, AVStream *st, AVIOContext
avio_rb24(pb); /* buffer size db */
v = avio_rb32(pb);
- // TODO: fix this
- //if (v < INT32_MAX)
- // st->codecpar->rc_max_rate = v;
+
+ // TODO: fix this with codecpar
+#if FF_API_LAVF_AVCTX
+FF_DISABLE_DEPRECATION_WARNINGS
+ if (v < INT32_MAX)
+ st->codec->rc_max_rate = v;
+FF_ENABLE_DEPRECATION_WARNINGS
+#endif
st->codecpar->bit_rate = avio_rb32(pb); /* avg bitrate */