summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-12-11 21:34:50 +0000
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>2010-12-11 21:34:50 +0000
commitb72daad0621f46719723f5b93bf9924b52c76ce5 (patch)
tree4e2e93c29c31cb639a7f4521aa24718642ae9492 /libavformat
parentfe858d7bd14a85090e1f1ab2852c18d8a45889a1 (diff)
Remove hack in MP3 probe that was meant as a work-around for large
ID3v2 tags which no longer works since ID3v2 handling was moved to generic code. In addition, in caused false-positives for all files starting with one or more 0-bytes. Originally committed as revision 25929 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/mp3.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/libavformat/mp3.c b/libavformat/mp3.c
index ceba2ce506..9c5c149d39 100644
--- a/libavformat/mp3.c
+++ b/libavformat/mp3.c
@@ -68,7 +68,6 @@ static int mp3_read_probe(AVProbeData *p)
if (first_frames>=4) return AVPROBE_SCORE_MAX/2+1;
else if(max_frames>500)return AVPROBE_SCORE_MAX/2;
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