diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 18:22:37 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-10 18:22:41 +0200 |
| commit | fbc133915bb09d874fb9c1208f1441746294af2c (patch) | |
| tree | 84e18354a8353dd1bddc95933a36e73d6f3304e2 /libavformat/utils.c | |
| parent | 3a76d7f73d495c5af0968e83d96c075c27af3b5c (diff) | |
| parent | 5482780a3b6ef0a8934cf29aa7e2f1ef7ccb701e (diff) | |
| download | ffmpeg-fbc133915bb09d874fb9c1208f1441746294af2c.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
Allow values >31bit for -analyzeduration.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index ae2e233876..5e6b1b055b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3095,7 +3095,9 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) // new streams might appear, no options for those int orig_nb_streams = ic->nb_streams; int flush_codecs = ic->probesize > 0; - int max_analyze_duration = ic->max_analyze_duration; + int64_t max_analyze_duration = ic->max_analyze_duration2; + if (!max_analyze_duration) + max_analyze_duration = ic->max_analyze_duration; if (!max_analyze_duration) { if (!strcmp(ic->iformat->name, "flv") && !(ic->ctx_flags & AVFMTCTX_NOHEADER)) { @@ -3318,7 +3320,7 @@ 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 >= max_analyze_duration) { - av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %d reached at %"PRId64" microseconds\n", + av_log(ic, AV_LOG_VERBOSE, "max_analyze_duration %"PRId64" reached at %"PRId64" microseconds\n", max_analyze_duration, t); break; |