avformat/movenc: Check for extradata before writing moov tag

Author: BtbN

libavformat/movenc.c

@@ -3121,10 +3121,29 @@ static void build_chunks(MOVTrack *trk)
     }
 }
 
+static int copy_late_extradata(MOVTrack *track)
+{
+    if (track->vos_len || !track->enc->extradata_size)
+        return 0;
+
+    if (TAG_IS_AVCI(track->tag) || track->enc->codec_id == AV_CODEC_ID_DNXHD)
+        return 0;
+
+    track->vos_len = track->enc->extradata_size;
+    track->vos_data = av_malloc(track->vos_len);
+
+    if (!track->vos_data)
+        return AVERROR(ENOMEM);
+
+    memcpy(track->vos_data, track->enc->extradata, track->vos_len);
+
+    return 0;
+}
+
 static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov,
                               AVFormatContext *s)
 {
-    int i;
+    int i, ret;
     int64_t pos = avio_tell(pb);
     avio_wb32(pb, 0); /* size placeholder*/
     ffio_wfourcc(pb, "moov");
@@ -3136,6 +3155,9 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov,
         mov->tracks[i].time     = mov->time;
         mov->tracks[i].track_id = i + 1;
 
+        if (ret = copy_late_extradata(&mov->tracks[i]))
+            return ret;
+
         if (mov->tracks[i].entry)
             build_chunks(&mov->tracks[i]);
     }
@@ -3169,7 +3191,7 @@ static int mov_write_moov_tag(AVIOContext *pb, MOVMuxContext *mov,
         mov_write_iods_tag(pb, mov);
     for (i = 0; i < mov->nb_streams; i++) {
         if (mov->tracks[i].entry > 0 || mov->flags & FF_MOV_FLAG_FRAGMENT) {
-            int ret = mov_write_trak_tag(pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);
+            ret = mov_write_trak_tag(pb, mov, &(mov->tracks[i]), i < s->nb_streams ? s->streams[i] : NULL);
             if (ret < 0)
                 return ret;
         }