Commit 5b25dfa7 authored by Fabrice Bellard's avatar Fabrice Bellard
Browse files

do not read probe data if format is specified - match_ext() must be exported

Originally committed as revision 1222 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 772956c5
......@@ -54,7 +54,7 @@ void av_register_output_format(AVOutputFormat *format)
format->next = NULL;
}
static int match_ext(const char *filename, const char *extensions)
int match_ext(const char *filename, const char *extensions)
{
const char *ext, *p;
char ext1[32], *q;
......@@ -335,9 +335,11 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
if (buf_size > 0) {
url_setbufsize(&ic->pb, buf_size);
}
/* read probe data */
pd->buf_size = get_buffer(&ic->pb, buf, PROBE_BUF_SIZE);
url_fseek(&ic->pb, 0, SEEK_SET);
if (!fmt) {
/* read probe data */
pd->buf_size = get_buffer(&ic->pb, buf, PROBE_BUF_SIZE);
url_fseek(&ic->pb, 0, SEEK_SET);
}
}
/* guess file format */
......
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