[FFmpeg-cvslog] mkv: report average framerate as minimal as well

Luca Barbato git at videolan.org
Wed Apr 18 22:28:25 CEST 2012


ffmpeg | branch: master | Luca Barbato <lu_zero at gentoo.org> | Tue Apr 17 15:47:22 2012 -0700| [204bcdf56c8f7dae5c487ab0da5c647154f0cd2a] | committer: Luca Barbato

mkv: report average framerate as minimal as well

This is in line with other demuxers and overall seems more correct
than assuming codec time base.

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=204bcdf56c8f7dae5c487ab0da5c647154f0cd2a
---

 libavformat/matroskadec.c |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/libavformat/matroskadec.c b/libavformat/matroskadec.c
index c32a943..8323601 100644
--- a/libavformat/matroskadec.c
+++ b/libavformat/matroskadec.c
@@ -1551,6 +1551,7 @@ static int matroska_read_header(AVFormatContext *s)
             if (st->codec->codec_id != CODEC_ID_H264)
             st->need_parsing = AVSTREAM_PARSE_HEADERS;
             if (track->default_duration)
+                st->r_frame_rate   =
                 st->avg_frame_rate = av_d2q(1000000000.0/track->default_duration, INT_MAX);
         } else if (track->type == MATROSKA_TRACK_TYPE_AUDIO) {
             st->codec->codec_type = AVMEDIA_TYPE_AUDIO;



More information about the ffmpeg-cvslog mailing list