mirror of https://git.ffmpeg.org/ffmpeg.git
avformat: Print "Consider increasing the value for analzeduration and probesize" even more often
The sample from ticket #2691 currently does not trigger "Consider increasing the value for analzeduration and probesize" because the audio streams are only added after calling estimate_timings(). Attached patch moves the message below this function call. Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
parent
a478e99a60
commit
2492f7774f
|
@ -2890,7 +2890,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||||
|
|
||||||
ret = -1; /* we could not have all the codec parameters before EOF */
|
ret = -1; /* we could not have all the codec parameters before EOF */
|
||||||
for(i=0;i<ic->nb_streams;i++) {
|
for(i=0;i<ic->nb_streams;i++) {
|
||||||
const char *errmsg;
|
|
||||||
|
|
||||||
st = ic->streams[i];
|
st = ic->streams[i];
|
||||||
|
|
||||||
|
@ -2907,17 +2906,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||||
"decoding for stream %d failed\n", st->index);
|
"decoding for stream %d failed\n", st->index);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!has_codec_parameters(st, &errmsg)) {
|
|
||||||
char buf[256];
|
|
||||||
avcodec_string(buf, sizeof(buf), st->codec, 0);
|
|
||||||
av_log(ic, AV_LOG_WARNING,
|
|
||||||
"Could not find codec parameters for stream %d (%s): %s\n"
|
|
||||||
"Consider increasing the value for the 'analyzeduration' and 'probesize' options\n",
|
|
||||||
i, buf, errmsg);
|
|
||||||
} else {
|
|
||||||
ret = 0;
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -3027,6 +3015,21 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
|
||||||
if(ic->probesize)
|
if(ic->probesize)
|
||||||
estimate_timings(ic, old_offset);
|
estimate_timings(ic, old_offset);
|
||||||
|
|
||||||
|
for(i=0;i<ic->nb_streams;i++) {
|
||||||
|
const char *errmsg;
|
||||||
|
st = ic->streams[i];
|
||||||
|
if (!has_codec_parameters(st, &errmsg)) {
|
||||||
|
char buf[256];
|
||||||
|
avcodec_string(buf, sizeof(buf), st->codec, 0);
|
||||||
|
av_log(ic, AV_LOG_WARNING,
|
||||||
|
"Could not find codec parameters for stream %d (%s): %s\n"
|
||||||
|
"Consider increasing the value for the 'analyzeduration' and 'probesize' options\n",
|
||||||
|
i, buf, errmsg);
|
||||||
|
} else {
|
||||||
|
ret = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
compute_chapters_end(ic);
|
compute_chapters_end(ic);
|
||||||
|
|
||||||
find_stream_info_err:
|
find_stream_info_err:
|
||||||
|
|
Loading…
Reference in New Issue