aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnton Khirnov <anton@khirnov.net>2016-03-03 10:07:55 +0100
committerAnton Khirnov <anton@khirnov.net>2016-03-04 08:26:34 +0100
commit1ceb07eb313c2d51383408025e57a2fe50ccd164 (patch)
tree894b627f304941e09c96817b711b49125b0c8360
parent11843ededacd0157aea642771837557549b5b417 (diff)
downloadffmpeg-1ceb07eb313c2d51383408025e57a2fe50ccd164.tar.gz
avformat_find_stream_info: move duration guessing after updating codec parameters
This bitrate might not be known otherwise. Bug-Id: 926
-rw-r--r--libavformat/utils.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavformat/utils.c b/libavformat/utils.c
index a70746aa99..31faa958a6 100644
--- a/libavformat/utils.c
+++ b/libavformat/utils.c
@@ -2431,8 +2431,6 @@ FF_ENABLE_DEPRECATION_WARNINGS
}
}
- estimate_timings(ic, old_offset);
-
compute_chapters_end(ic);
/* update the stream parameters from the internal codec contexts */
@@ -2465,6 +2463,8 @@ FF_ENABLE_DEPRECATION_WARNINGS
st->internal->avctx_inited = 0;
}
+ estimate_timings(ic, old_offset);
+
find_stream_info_err:
for (i = 0; i < ic->nb_streams; i++) {
av_freep(&ic->streams[i]->info);