Commit 79750486 authored by Michael Niedermayer's avatar Michael Niedermayer

require at least a score of AVPROBE_SCORE_MAX/4 or reaching of PROBE_BUF_MAX

to detect a container
fixes probing of mpeg_probe_fail.mpg

Originally committed as revision 8535 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 7ebf5927
......@@ -237,13 +237,12 @@ int av_filename_number_test(const char *filename)
return filename && (av_get_frame_filename(buf, sizeof(buf), filename, 1)>=0);
}
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
static AVInputFormat *av_probe_input_format2(AVProbeData *pd, int is_opened, int *score_max)
{
AVInputFormat *fmt1, *fmt;
int score, score_max;
int score;
fmt = NULL;
score_max = 0;
for(fmt1 = first_iformat; fmt1 != NULL; fmt1 = fmt1->next) {
if (!is_opened == !(fmt1->flags & AVFMT_NOFILE))
continue;
......@@ -255,14 +254,19 @@ AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened)
score = 50;
}
}
if (score > score_max) {
score_max = score;
if (score > *score_max) {
*score_max = score;
fmt = fmt1;
}
}
return fmt;
}
AVInputFormat *av_probe_input_format(AVProbeData *pd, int is_opened){
int score=0;
return av_probe_input_format2(pd, is_opened, &score);
}
/************************************************************/
/* input media file */
......@@ -423,6 +427,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
}
for(probe_size= PROBE_BUF_MIN; probe_size<=PROBE_BUF_MAX && !fmt; probe_size<<=1){
int score= probe_size < PROBE_BUF_MAX ? AVPROBE_SCORE_MAX/4 : 0;
/* read probe data */
pd->buf= av_realloc(pd->buf, probe_size);
pd->buf_size = get_buffer(pb, pd->buf, probe_size);
......@@ -435,7 +440,7 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
}
}
/* guess file format */
fmt = av_probe_input_format(pd, 1);
fmt = av_probe_input_format2(pd, 1, &score);
}
av_freep(&pd->buf);
}
......
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