diff options
| author | Ganesh Ajjanagadde <gajjanagadde@gmail.com> | 2015-07-17 22:09:48 -0400 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-18 04:52:49 +0200 |
| commit | f6870495e1589f0931f62bdf777fc0ad299e9c14 (patch) | |
| tree | 6a8030dcc982ac37b7e7d89bb1416dea4f3d4f28 | |
| parent | 9010be252e57bf9cb907ff298dbc73017bf6a33f (diff) | |
| download | ffmpeg-f6870495e1589f0931f62bdf777fc0ad299e9c14.tar.gz | |
avformat: increase first_frames threshold for mp3,ac3
Fixes Ticket4723
Signed-off-by: Ganesh Ajjanagadde <gajjanagadde@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
| -rw-r--r-- | libavformat/ac3dec.c | 2 | ||||
| -rw-r--r-- | libavformat/mp3dec.c | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/ac3dec.c b/libavformat/ac3dec.c index 58ef44d45a..bef55cb658 100644 --- a/libavformat/ac3dec.c +++ b/libavformat/ac3dec.c @@ -80,7 +80,7 @@ static int ac3_eac3_probe(AVProbeData *p, enum AVCodecID expected_codec_id) if(codec_id != expected_codec_id) return 0; // keep this in sync with mp3 probe, both need to avoid // issues with MPEG-files! - if (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1; + if (first_frames>=7) return AVPROBE_SCORE_EXTENSION + 1; else if(max_frames>200)return AVPROBE_SCORE_EXTENSION; else if(max_frames>=4) return AVPROBE_SCORE_EXTENSION/2; else if(max_frames>=1) return 1; diff --git a/libavformat/mp3dec.c b/libavformat/mp3dec.c index 731dc6371d..20af7bce9d 100644 --- a/libavformat/mp3dec.c +++ b/libavformat/mp3dec.c @@ -98,7 +98,7 @@ static int mp3_read_probe(AVProbeData *p) avcodec_free_context(&avctx); // keep this in sync with ac3 probe, both need to avoid // issues with MPEG-files! - if (first_frames>=4) return AVPROBE_SCORE_EXTENSION + 1; + if (first_frames>=7) return AVPROBE_SCORE_EXTENSION + 1; else if(max_frames>200)return AVPROBE_SCORE_EXTENSION; else if(max_frames>=4 && max_frames >= p->buf_size/10000) return AVPROBE_SCORE_EXTENSION / 2; else if(ff_id3v2_match(buf0, ID3v2_DEFAULT_MAGIC) && 2*ff_id3v2_tag_len(buf0) >= p->buf_size) |