ffmpeg | branch: master | Michael Niedermayer <mich...@niedermayer.cc> | Wed Jun 22 13:59:19 2016 +0200| [99c3c3237bb56bead8f996874e5a283069713f07] | committer: Michael Niedermayer
avformat/utils: Use internal->avctx for bitrate in estimate_timings_from_bit_rate() if needed The internal avctx bitrate is copied into codecpar after estimate_timings() Fixes Ticket5646 Signed-off-by: Michael Niedermayer <mich...@niedermayer.cc> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=99c3c3237bb56bead8f996874e5a283069713f07 --- libavformat/utils.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/utils.c b/libavformat/utils.c index e2037db..a3c6705 100644 --- a/libavformat/utils.c +++ b/libavformat/utils.c @@ -2568,6 +2568,8 @@ static void estimate_timings_from_bit_rate(AVFormatContext *ic) int64_t bit_rate = 0; for (i = 0; i < ic->nb_streams; i++) { st = ic->streams[i]; + if (st->codecpar->bit_rate <= 0 && st->internal->avctx->bit_rate > 0) + st->codecpar->bit_rate = st->internal->avctx->bit_rate; if (st->codecpar->bit_rate > 0) { if (INT64_MAX - st->codecpar->bit_rate < bit_rate) { bit_rate = 0; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
