[FFmpeg-cvslog] avformat/utils: set max analyze duration depending on the circumstances

Michael Niedermayer git at videolan.org
Mon May 26 22:37:50 CEST 2014


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon May 26 22:10:41 2014 +0200| [e6a084641aada7a2e4672172f2ee26642800a361] | committer: Michael Niedermayer

avformat/utils: set max analyze duration depending on the circumstances

Fixes Ticket3673

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e6a084641aada7a2e4672172f2ee26642800a361
---

 libavformat/utils.c |    8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/libavformat/utils.c b/libavformat/utils.c
index f07a33e..f35e956 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3291,8 +3291,12 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
             int64_t t = 0;
             int max_analyze_duration = ic->max_analyze_duration;
 
-            if (!max_analyze_duration)
-                max_analyze_duration = 5*AV_TIME_BASE;
+            if (!max_analyze_duration) {
+                if (!strcmp(ic->iformat->name, "flv") && !(ic->ctx_flags & AVFMTCTX_NOHEADER)) {
+                    max_analyze_duration = 10*AV_TIME_BASE;
+                } else
+                    max_analyze_duration = 5*AV_TIME_BASE;
+            }
 
             if (st->time_base.den > 0)
                 t = av_rescale_q(st->info->codec_info_duration, st->time_base, AV_TIME_BASE_Q);



More information about the ffmpeg-cvslog mailing list