Skip to content

V
vlc
Commit b775ea9d authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

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

parent 4bc1c25b
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 1 deletion
modules/codec/ffmpeg/encoder.c
View file @ b775ea9d
...@@ -601,7 +601,12 @@ int E_(OpenEncoder)( vlc_object_t *p_this ) ...@@ -601,7 +601,12 @@ int E_(OpenEncoder)( vlc_object_t *p_this )
vlc_mutex_unlock( lockval.p_address ); vlc_mutex_unlock( lockval.p_address );
p_enc->fmt_out.i_extra = p_context->extradata_size; 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; p_context->flags &= ~CODEC_FLAG_GLOBAL_HEADER;
if( p_enc->fmt_in.i_cat == AUDIO_ES ) if( p_enc->fmt_in.i_cat == AUDIO_ES )
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment