ffmpeg | branch: master | Michael Niedermayer <michae...@gmx.at> | Mon Nov 3 22:53:48 2014 +0100| [a7f25979dd568f4f7253ebb3e30f802c7009fbaa] | committer: Michael Niedermayer
avformat/utils: Leave skip_clear enabled until after estimate_timings() Should make no difference but will be needed for subsequent commits Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=a7f25979dd568f4f7253ebb3e30f802c7009fbaa --- libavformat/utils.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/libavformat/utils.c b/libavformat/utils.c index d3e1e06..8da8db4 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -3286,7 +3286,6 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) } } } - av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN); // close codecs which were opened in try_decode_frame() for (i = 0; i < ic->nb_streams; i++) { @@ -3375,6 +3374,8 @@ int avformat_find_stream_info(AVFormatContext *ic, AVDictionary **options) if (probesize) estimate_timings(ic, old_offset); + av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN); + if (ret >= 0 && ic->nb_streams) /* We could not have all the codec parameters before EOF. */ ret = -1; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
