diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 12:25:28 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-20 12:34:54 +0200 |
| commit | eec75e0a1fc952d5ca31de8f5c8d934cfa52edf2 (patch) | |
| tree | f78072a96f280976a881414c3aa703267a1e85ad /libavformat | |
| parent | 4a6f1be170a057ee3d582e5f110ed659926c093c (diff) | |
| parent | 22de0f8369f1f3edf1a55e1d275f3c07c617b53e (diff) | |
Merge commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e'
* commit '22de0f8369f1f3edf1a55e1d275f3c07c617b53e':
mov: Compute max duration among the tracks with a timescale
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/movenc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 8c07e60c13..5b70468014 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1877,7 +1877,7 @@ static int mov_write_mvhd_tag(AVIOContext *pb, MOVMuxContext *mov) int version; for (i = 0; i < mov->nb_streams; i++) { - if (mov->tracks[i].entry > 0) { + if (mov->tracks[i].entry > 0 && mov->tracks[i].timescale) { max_track_len_temp = av_rescale_rnd(mov->tracks[i].track_duration, MOV_TIMESCALE, mov->tracks[i].timescale, |