diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-03 22:53:48 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-03 22:53:48 +0100 |
| commit | a7f25979dd568f4f7253ebb3e30f802c7009fbaa (patch) | |
| tree | 9632c7080c7b43a1fc54625f040fb0bd25cf356d /libavformat/utils.c | |
| parent | a6593f7cc6e4aeebcae4a0f74ca105940379419e (diff) | |
| download | ffmpeg-a7f25979dd568f4f7253ebb3e30f802c7009fbaa.tar.gz | |
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 <michaelni@gmx.at>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d3e1e0609b..8da8db4c43 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; |