Commit 85e1368f authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit 'db9d39b4'

* commit 'db9d39b4':
  avformat: Report the duration analysis reached

Conflicts:
	libavformat/utils.c

See: 8529f9b3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents dbc3e110 db9d39b4
......@@ -3223,7 +3223,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
t = FFMAX(t, av_rescale_q(st->info->fps_last_dts - st->info->fps_first_dts, st->time_base, AV_TIME_BASE_Q));
if (t >= ic->max_analyze_duration) {
av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %d reached at %"PRId64" microseconds\n", ic->max_analyze_duration, t);
av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %d reached at %"PRId64" microseconds\n",
ic->max_analyze_duration,
t);
break;
}
if (pkt->duration) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment