Commit 73c9e8a9 authored by michael's avatar michael

reduce scores if the mp3 frames dont start from the begin of the file (fixes...

reduce scores if the mp3 frames dont start from the begin of the file (fixes flv deteted as mp3 issues)


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6304 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 896b2810
...@@ -244,7 +244,7 @@ static void id3_create_tag(AVFormatContext *s, uint8_t *buf) ...@@ -244,7 +244,7 @@ static void id3_create_tag(AVFormatContext *s, uint8_t *buf)
static int mp3_read_probe(AVProbeData *p) static int mp3_read_probe(AVProbeData *p)
{ {
int max_frames; int max_frames, first_frames;
int fsize, frames; int fsize, frames;
uint32_t header; uint32_t header;
uint8_t *buf, *buf2, *end; uint8_t *buf, *buf2, *end;
...@@ -271,10 +271,12 @@ static int mp3_read_probe(AVProbeData *p) ...@@ -271,10 +271,12 @@ static int mp3_read_probe(AVProbeData *p)
buf2 += fsize; buf2 += fsize;
} }
max_frames = FFMAX(max_frames, frames); max_frames = FFMAX(max_frames, frames);
if(buf == p->buf)
first_frames= frames;
} }
if (max_frames>=3) return AVPROBE_SCORE_MAX/2+1; if (first_frames>=3) return AVPROBE_SCORE_MAX/2+1;
else if(max_frames==2) return AVPROBE_SCORE_MAX/4; else if(max_frames>=3) return AVPROBE_SCORE_MAX/4;
else if(max_frames==1) return 1; else if(max_frames>=1) return 1;
else return 0; else return 0;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment