diff options
| author | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 15:36:55 +0100 |
|---|---|---|
| committer | Derek Buitenhuis <derek.buitenhuis@gmail.com> | 2016-04-13 15:36:55 +0100 |
| commit | 3c461eecd48ba2cf7616d98e6f99954de3ad4b06 (patch) | |
| tree | 79e33a31b208432d505b8857b0fa94a8c514245a /libavformat/utils.c | |
| parent | 884dd175f061c03d7ba4896685e81bf8adc3ea94 (diff) | |
| parent | 1ceb07eb313c2d51383408025e57a2fe50ccd164 (diff) | |
| download | ffmpeg-streaming-3c461eecd48ba2cf7616d98e6f99954de3ad4b06.zip ffmpeg-streaming-3c461eecd48ba2cf7616d98e6f99954de3ad4b06.tar.gz | |
Merge commit '1ceb07eb313c2d51383408025e57a2fe50ccd164'
* commit '1ceb07eb313c2d51383408025e57a2fe50ccd164':
avformat_find_stream_info: move duration guessing after updating codec parameters
Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
Diffstat (limited to 'libavformat/utils.c')
| -rw-r--r-- | libavformat/utils.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c index d6aba5a..bf4ea2b 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -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]; |
