projects
/
platform
/
upstream
/
libav.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
3952303
)
mov: Compute max duration among the tracks with a timescale
author
Luca Barbato
<lu_zero@gentoo.org>
Mon, 19 Aug 2013 15:18:22 +0000
(17:18 +0200)
committer
Luca Barbato
<lu_zero@gentoo.org>
Mon, 19 Aug 2013 22:22:58 +0000
(
00:22
+0200)
Prevent an assert.
libavformat/movenc.c
patch
|
blob
|
history
diff --git
a/libavformat/movenc.c
b/libavformat/movenc.c
index
b41261c
..
0f21ae2
100644
(file)
--- a/
libavformat/movenc.c
+++ b/
libavformat/movenc.c
@@
-1640,7
+1640,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,