diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-11-05 23:43:29 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-11-06 00:10:28 +0100 |
| commit | ea83b032af825d10f7d6db8a71933edce5b842a3 (patch) | |
| tree | 3cc06d3bb0bcc2f8f31281b2a20590bba9cc22df | |
| parent | 0e55902324f07c91821154ad4cf84cbc8066a1f5 (diff) | |
| download | ffmpeg-ea83b032af825d10f7d6db8a71933edce5b842a3.tar.gz | |
matroskaenc: base default duration on avg_frame_rate if possible.
Fixed Ticket432
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavformat/matroskaenc.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 07a4bb380a..131a7498af 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -574,7 +574,10 @@ static int mkv_write_tracks(AVFormatContext *s) switch (codec->codec_type) { case AVMEDIA_TYPE_VIDEO: put_ebml_uint(pb, MATROSKA_ID_TRACKTYPE, MATROSKA_TRACK_TYPE_VIDEO); - put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, av_q2d(codec->time_base)*1E9); + if(st->avg_frame_rate.num && st->avg_frame_rate.den && 1.0/av_q2d(st->avg_frame_rate) > av_q2d(codec->time_base)) + put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, 1E9/av_q2d(st->avg_frame_rate)); + else + put_ebml_uint(pb, MATROSKA_ID_TRACKDEFAULTDURATION, av_q2d(codec->time_base)*1E9); if (!native_id && ff_codec_get_tag(codec_movvideo_tags, codec->codec_id) && |