diff options
| author | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-10 14:28:34 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-06-10 14:28:34 +0200 |
| commit | 5482780a3b6ef0a8934cf29aa7e2f1ef7ccb701e (patch) | |
| tree | 3f384b4cb2992a5dae974e9357715bdc28429648 /libavformat/utils.c | |
| parent | 2351ea8a2e8c1ce74c87c8d48494dc2dd4b53ded (diff) | |
| download | ffmpeg-5482780a3b6ef0a8934cf29aa7e2f1ef7ccb701e.tar.gz | |
Allow values >31bit for -analyzeduration.
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 5c646c63df..ba409ec859 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)) { @@ -3317,7 +3319,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; |