Browse Source

probe: belive protocol content type if set and avoid lengthly probing.

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n1.1
Michael Niedermayer 12 years ago
parent
commit
e3d95b54db
1 changed files with 5 additions and 0 deletions
  1. +5
    -0
      libavformat/utils.c

+ 5
- 0
libavformat/utils.c View File

@@ -413,6 +413,7 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
{
AVProbeData pd = { filename ? filename : "", NULL, -offset };
unsigned char *buf = NULL;
uint8_t *demuxer_name;
int ret = 0, probe_size, buf_offset = 0;

if (!max_probe_size) {
@@ -427,6 +428,10 @@ int av_probe_input_buffer(AVIOContext *pb, AVInputFormat **fmt,
return AVERROR(EINVAL);
}

if (!*fmt && pb && pb->av_class && av_opt_get(pb, "demuxer", AV_OPT_SEARCH_CHILDREN, &demuxer_name) >= 0 && demuxer_name) {
*fmt = av_find_input_format(demuxer_name);
}

for(probe_size= PROBE_BUF_MIN; probe_size<=max_probe_size && !*fmt;
probe_size = FFMIN(probe_size<<1, FFMAX(max_probe_size, probe_size+1))) {
int score = probe_size < max_probe_size ? AVPROBE_SCORE_RETRY : 0;


Loading…
Cancel
Save