Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/FFmpeg/FFmpeg.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2015-12-03 22:18:35 +0300
committerMichael Niedermayer <michael@niedermayer.cc>2015-12-03 22:20:09 +0300
commit4e31176e145fe532bf9d9793ed562ab9373f1de7 (patch)
tree83fb7148193ada6ddd23a5a00405903ff2f1ef03 /libavformat/riffdec.c
parent32bf6550cb9cc9f487a6722fe2bfc272a93c1065 (diff)
avformat/riffdec: remove special case for bitrate > 32bit
AVCodecContext.bitrate is 64bit Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavformat/riffdec.c')
-rw-r--r--libavformat/riffdec.c16
1 files changed, 1 insertions, 15 deletions
diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c
index a38ea39f0d..aa637b6fcf 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,