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

Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164' 

* commit '1ceb07eb313c2d51383408025e57a2fe50ccd164':
  avformat_find_stream_info: move duration guessing after updating codec parameters

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
This commit is contained in:
Derek Buitenhuis 2016-04-13 15:36:55 +01:00
parent 884dd175f0 1ceb07eb31
commit 3c461eecd4
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavformat/utils.c
View File

@ -3723,9 +3723,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
}
if (probesize)
estimate_timings(ic, old_offset);
av_opt_set(ic, "skip_clear", "0", AV_OPT_SEARCH_CHILDREN);
if (ret >= 0 && ic->nb_streams)
@ -3806,6 +3803,9 @@ FF_ENABLE_DEPRECATION_WARNINGS
st->internal->avctx_inited = 0;
}
if (probesize)
estimate_timings(ic, old_offset);
find_stream_info_err:
for (i = 0; i < ic->nb_streams; i++) {
st = ic->streams[i];