diff mbox

[FFmpeg-devel] lavf/movenc: fix tmcd writing for non-MP4/MOV modes

Message ID d4468294-5ab6-85d0-16e0-75d4f0c1d9be@gyani.pro
State Superseded
Headers show

Commit Message

Gyan Doshi March 30, 2019, 6:41 p.m. UTC
Regression since, I believe, 42cb050a05
From 22620ccaae074700c8c470a78daa7682638cecbf Mon Sep 17 00:00:00 2001
From: Gyan Doshi <ffmpeg@gyani.pro>
Date: Sun, 31 Mar 2019 00:00:50 +0530
Subject: [PATCH] lavf/movenc: fix tmcd writing for non-MP4/MOV modes

write_tmcd allows tmcd track to be created with any mode but in
mov_write_header, index for first tmcd track is only set for modes
MP4 or MOV, causing a crash if tmcd creation is attempted with other
modes.
---
 libavformat/movenc.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

Comments

Tomas Härdin April 1, 2019, 9:24 a.m. UTC | #1
sön 2019-03-31 klockan 00:11 +0530 skrev Gyan:
> Regression since, I believe, 42cb050a05

Sounds like there should be a test case to go along with it so it
doesn't re-regress in the future :)

/Tomas
Gyan Doshi April 2, 2019, 12:01 p.m. UTC | #2
On 01-04-2019 02:54 PM, Tomas Härdin wrote:
> sön 2019-03-31 klockan 00:11 +0530 skrev Gyan:
>> Regression since, I believe, 42cb050a05
> Sounds like there should be a test case to go along with it so it
> doesn't re-regress in the future :)

Turns out there's already a test. But the command is ineffective :)

Will fix it.

Thanks,
Gyan
diff mbox

Patch

diff --git a/libavformat/movenc.c b/libavformat/movenc.c
index 8969d5b170..2d53079cb0 100644
--- a/libavformat/movenc.c
+++ b/libavformat/movenc.c
@@ -6381,7 +6381,7 @@  static int mov_write_header(AVFormatContext *s)
                 nb_tracks++;
     }
 
-    if (mov->mode == MODE_MOV || mov->mode == MODE_MP4)
+    if (mov->nb_meta_tmcd)
         tmcd_track = nb_tracks;
 
     for (i = 0; i < s->nb_streams; i++) {