diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2009-04-22 02:58:20 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2009-04-22 02:58:20 +0000 |
| commit | f9f2ab8229050a1771095038a65606d6fe9bbaa5 (patch) | |
| tree | 709f00881d395bfa2fbd99e8a3170f8217b40de3 /libavformat/mp3.c | |
| parent | 0ee51c556ebbebf632a5db0de58decc9fdb760d4 (diff) | |
Require 4 instead of 3 frames for detecting mp3,
fixes misdetection of mpegps_mp3_unrecognized_format.mpg (issue997)
Originally committed as revision 18657 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat/mp3.c')
| -rw-r--r-- | libavformat/mp3.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c index b032f0c09e..e835a34424 100644 --- a/libavformat/mp3.c +++ b/libavformat/mp3.c @@ -391,10 +391,11 @@ static int mp3_read_probe(AVProbeData *p) } if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1; else if(max_frames>500)return AVPROBE_SCORE_MAX/2; - else if(max_frames>=3) return AVPROBE_SCORE_MAX/4; + else if(max_frames>=4) return AVPROBE_SCORE_MAX/4; else if(buf0!=p->buf) return AVPROBE_SCORE_MAX/4-1; else if(max_frames>=1) return 1; else return 0; +//mpegps_mp3_unrecognized_format.mpg has max_frames=3 } /** |