ffmpeg: Copy extradata if it has been initialized later from the encoder
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Sep 2014 02:42:48 +0000 (04:42 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 7 Sep 2014 01:13:44 +0000 (03:13 +0200)
Fixes Ticket3909

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg.c

index 220816b..0807eec 100644 (file)
--- a/ffmpeg.c
+++ b/ffmpeg.c
@@ -590,6 +590,14 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
     AVCodecContext          *avctx = ost->st->codec;
     int ret;
 
+    if (!ost->st->codec->extradata_size && ost->enc_ctx->extradata_size) {
+        ost->st->codec->extradata = av_mallocz(ost->enc_ctx->extradata_size + FF_INPUT_BUFFER_PADDING_SIZE);
+        if (ost->st->codec->extradata) {
+            memcpy(ost->st->codec->extradata, ost->enc_ctx->extradata, ost->enc_ctx->extradata_size);
+            ost->st->codec->extradata_size = ost->enc_ctx->extradata_size;
+        }
+    }
+
     if ((avctx->codec_type == AVMEDIA_TYPE_VIDEO && video_sync_method == VSYNC_DROP) ||
         (avctx->codec_type == AVMEDIA_TYPE_AUDIO && audio_sync_method < 0))
         pkt->pts = pkt->dts = AV_NOPTS_VALUE;