Browse Source

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
tags/v0.5
Fabrice Bellard 22 years ago
parent
commit
5b25dfa708
1 changed files with 6 additions and 4 deletions
  1. +6
    -4
      libav/utils.c

+ 6
- 4
libav/utils.c View File

@@ -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 */


Loading…
Cancel
Save