diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 02:04:41 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-03-12 02:11:47 +0100 |
| commit | 85e1368f57a6611f0671f7581b82af34ac289494 (patch) | |
| tree | 328ba846fe9347299b0094fbad14b4a7492b5e4f /libavformat | |
| parent | dbc3e1109cddd7ab653dce0f7758bad17b94803d (diff) | |
| parent | db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf (diff) | |
Merge commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf'
* commit 'db9d39b4b5e5a3c20aeecf787ddeadd88f4906cf':
avformat: Report the duration analysis reached
Conflicts:
libavformat/utils.c
See: 8529f9b36b7c1b8f2cb36ba2709983517c4b6458
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index 4e262b14d4..4065a790d6 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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) { |