RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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>
This commit is contained in:
Michael Niedermayer 2014-11-03 22:53:48 +01:00
parent a6593f7cc6
commit a7f25979dd
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavformat/utils.c
View File

@ -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;