[FFmpeg-cvslog] avformat/matroskaenc: use r_frame_rate as fallback to set a track's DefaultDuration
James Almer
git at videolan.org
Sun Oct 6 19:45:41 EEST 2019
ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Tue Oct 1 12:58:20 2019 -0300| [5f758c31f9af6550a657ec2785c8c34838924e76] | committer: James Almer
avformat/matroskaenc: use r_frame_rate as fallback to set a track's DefaultDuration
Signed-off-by: James Almer <jamrial at gmail.com>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f758c31f9af6550a657ec2785c8c34838924e76
---
libavformat/matroskaenc.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c
index a64ffdb690..37706e56c7 100644
--- a/libavformat/matroskaenc.c
+++ b/libavformat/matroskaenc.c
@@ -1311,6 +1311,9 @@ static int mkv_write_track(AVFormatContext *s, MatroskaMuxContext *mkv,
if( st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0
&& av_cmp_q(av_inv_q(st->avg_frame_rate), st->time_base) > 0)
put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1000000000LL * st->avg_frame_rate.den / st->avg_frame_rate.num);
+ else if( st->r_frame_rate.num > 0 && st->r_frame_rate.den > 0
+ && av_cmp_q(av_inv_q(st->r_frame_rate), st->time_base) > 0)
+ put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1000000000LL * st->r_frame_rate.den / st->r_frame_rate.num);
if (!native_id &&
ff_codec_get_tag(ff_codec_movvideo_tags, par->codec_id) &&
More information about the ffmpeg-cvslog
mailing list