generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source 
Originally committed as revision 1222 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Fabrice Bellard 2002-11-18 17:17:27 +00:00
parent 772956c5d7
commit 5b25dfa708
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
libav/utils.c
View File

@ -54,7 +54,7 @@ void av_register_output_format(AVOutputFormat *format)
format->next = NULL; 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; const char *ext, *p;
char ext1[32], *q; char ext1[32], *q;
@ -335,9 +335,11 @@ int av_open_input_file(AVFormatContext **ic_ptr, const char *filename,
if (buf_size > 0) { if (buf_size > 0) {
url_setbufsize(&ic->pb, buf_size); url_setbufsize(&ic->pb, buf_size);
} }
/* read probe data */ if (!fmt) {
pd->buf_size = get_buffer(&ic->pb, buf, PROBE_BUF_SIZE); /* read probe data */
url_fseek(&ic->pb, 0, SEEK_SET); pd->buf_size = get_buffer(&ic->pb, buf, PROBE_BUF_SIZE);
url_fseek(&ic->pb, 0, SEEK_SET);
}
} }
/* guess file format */ /* guess file format */