[FFmpeg-cvslog] avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup out of the packet loop
Michael Niedermayer
git at videolan.org
Mon Jun 2 21:27:37 CEST 2014
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 2 21:21:11 2014 +0200| [1a426d5404257b60cd70a952d0767434f8d25db8] | committer: Michael Niedermayer
avformat/utils/avformat_find_stream_info: Move max_analyze_duration setup out of the packet loop
Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1a426d5404257b60cd70a952d0767434f8d25db8
---
libavformat/utils.c | 16 ++++++++--------
1 file changed, 8 insertions(+), 8 deletions(-)
diff --git a/libavformat/utils.c b/libavformat/utils.c
index d761768..5c646c6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -3095,6 +3095,14 @@ 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;
+
+ 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 (ic->pb)
av_log(ic, AV_LOG_DEBUG, "Before avformat_find_stream_info() pos: %"PRId64" bytes read:%"PRId64" seeks:%d\n",
@@ -3296,14 +3304,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options)
}
if (st->codec_info_nb_frames>1) {
int64_t t = 0;
- int max_analyze_duration = ic->max_analyze_duration;
-
- 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