[FFmpeg-cvslog] avformat/riffdec: remove special case for bitrate > 32bit
Michael Niedermayer
git at videolan.org
Thu Dec 3 20:48:04 CET 2015
ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Thu Dec 3 20:18:35 2015 +0100| [4e31176e145fe532bf9d9793ed562ab9373f1de7] | committer: Michael Niedermayer
avformat/riffdec: remove special case for bitrate > 32bit
AVCodecContext.bitrate is 64bit
Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=4e31176e145fe532bf9d9793ed562ab9373f1de7
---
libavformat/riffdec.c | 16 +---------------
1 file changed, 1 insertion(+), 15 deletions(-)
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index a38ea39..aa637b6 100644
--- a/libavformat/riffdec.c
+++ b/libavformat/riffdec.c
@@ -168,21 +168,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
codec->channels += codec->extradata[8 + i * 20 + 17];
}
- if (bitrate > INT_MAX) {
- if (s->error_recognition & AV_EF_EXPLODE) {
- av_log(s, AV_LOG_ERROR,
- "The bitrate %"PRIu64" is too large.\n",
- bitrate);
- return AVERROR_INVALIDDATA;
- } else {
- av_log(s, AV_LOG_WARNING,
- "The bitrate %"PRIu64" is too large, resetting to 0.",
- bitrate);
- codec->bit_rate = 0;
- }
- } else {
- codec->bit_rate = bitrate;
- }
+ codec->bit_rate = bitrate;
if (codec->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR,
More information about the ffmpeg-cvslog
mailing list