Message ID | 20191001155820.81-1-jamrial@gmail.com |
---|---|
State | Accepted |
Commit | 5f758c31f9af6550a657ec2785c8c34838924e76 |
Headers | show |
On 10/1/2019 12:58 PM, James Almer wrote: > Signed-off-by: James Almer <jamrial@gmail.com> > --- > 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) && Pushed.
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) &&
Signed-off-by: James Almer <jamrial@gmail.com> --- libavformat/matroskaenc.c | 3 +++ 1 file changed, 3 insertions(+)