From 5b25dfa708e7a5f73375f035e4e330bafcd70f45 Mon Sep 17 00:00:00 2001 From: Fabrice Bellard Date: Mon, 18 Nov 2002 17:17:27 +0000 Subject: [PATCH] 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 --- libav/utils.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/libav/utils.c b/libav/utils.c index c810d0c512..bc706f6823 100644 --- a/libav/utils.c +++ b/libav/utils.c @@ -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 */