OSDN Git Service
(root)
/
android-x86
/
external-ffmpeg.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4045a8d
)
avformat/isom: Fix old API regression with exporting max bitrate
author
Michael Niedermayer
<michael@niedermayer.cc>
Mon, 10 Oct 2016 00:06:12 +0000
(
02:06
+0200)
committer
Michael Niedermayer
<michael@niedermayer.cc>
Wed, 26 Oct 2016 17:46:00 +0000
(19:46 +0200)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
libavformat/isom.c
patch
|
blob
|
history
diff --git
a/libavformat/isom.c
b/libavformat/isom.c
index
cb457dd
..
ab79e22
100644
(file)
--- a/
libavformat/isom.c
+++ b/
libavformat/isom.c
@@
-488,9
+488,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 */