diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 12:48:36 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-05-29 12:58:55 +0200 |
| commit | bc59d39b824900bafb53bf174314a59c2491f2e3 (patch) | |
| tree | 91698562c76508c03f6c51fcf01aa8d25445aded /libavformat/matroskaenc.c | |
| parent | d9c4f61dab2a1994ae3220080583baab37cf2372 (diff) | |
| parent | 81eec081afea9fc017a175581ceea7c420a0dfc3 (diff) | |
Merge commit '81eec081afea9fc017a175581ceea7c420a0dfc3'
* commit '81eec081afea9fc017a175581ceea7c420a0dfc3':
matroskaenc: base DefaultDuration on the framerate, not the codec timebase
Conflicts:
libavformat/matroskaenc.c
tests/ref/lavf/mkv
tests/ref/seek/lavf-mkv
See: ea83b032af825d10f7d6db8a71933edce5b842a3
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/matroskaenc.c')
| -rw-r--r-- | libavformat/matroskaenc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/libavformat/matroskaenc.c b/libavformat/matroskaenc.c index 60ea64657b..c139339634 100644 --- a/libavformat/matroskaenc.c +++ b/libavformat/matroskaenc.c @@ -772,8 +772,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); - 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)); + + if( st->avg_frame_rate.num > 0 && st->avg_frame_rate.den > 0 + && 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); |