RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avformat/riffdec: remove special case for bitrate > 32bit 

AVCodecContext.bitrate is 64bit

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-12-03 20:18:35 +01:00
parent 32bf6550cb
commit 4e31176e14
1 changed files with 1 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
libavformat/riffdec.c
View File

@ -168,21 +168,7 @@ int ff_get_wav_header(AVFormatContext *s, AVIOContext *pb,
codec->channels += codec->extradata[8 + i * 20 + 17]; 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) { if (codec->sample_rate <= 0) {
av_log(s, AV_LOG_ERROR, av_log(s, AV_LOG_ERROR,