* modules/codec/ffmpeg/encoder.c: backport of 13065 from trunk.

diff --git a/modules/codec/ffmpeg/encoder.c b/modules/codec/ffmpeg/encoder.c
index bf58ddce6f018380b15f2002b709fdc5b6f44059..c6d833096daa00e5308a84194a94fd5a81f531b4 100644 (file)
--- a/modules/codec/ffmpeg/encoder.c
+++ b/modules/codec/ffmpeg/encoder.c
@@ -601,7 +601,12 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
     vlc_mutex_unlock( lockval.p_address );
 
     p_enc->fmt_out.i_extra = p_context->extradata_size;
-    p_enc->fmt_out.p_extra = p_context->extradata;
+    if( p_enc->fmt_out.i_extra )
+    {
+        p_enc->fmt_out.p_extra = malloc( p_enc->fmt_out.i_extra );
+        memcpy( p_enc->fmt_out.p_extra, p_context->extradata,
+                p_enc->fmt_out.i_extra );
+    }
     p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
 
     if( p_enc->fmt_in.i_cat == AUDIO_ES )