Skip to content

V
vlc-1.1
Commit 4efefb82 authored by Gildas Bazin's avatar Gildas Bazin
Browse files
Options

* modules/packetizer/*: bug fix (use es_format_Copy() when necessary).

parent 8bfe4ed2
Show whitespace changes
Inline Side-by-side
Showing with 2 additions and 8 deletions
modules/packetizer/copy.c
View file @ 4efefb82
...@@ -75,13 +75,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -75,13 +75,7 @@ static int Open( vlc_object_t *p_this )
p_dec->pf_packetize = Packetize; p_dec->pf_packetize = Packetize;
/* Create the output format */ /* Create the output format */
memcpy( &p_dec->fmt_out, &p_dec->fmt_in, sizeof( es_format_t ) ); es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
if( p_dec->fmt_in.i_extra > 0 )
{
p_dec->fmt_out.p_extra = malloc( p_dec->fmt_in.i_extra );
memcpy( p_dec->fmt_out.p_extra, p_dec->fmt_in.p_extra,
p_dec->fmt_in.i_extra );
}
/* Fix the value of the fourcc */ /* Fix the value of the fourcc */
switch( p_dec->fmt_in.i_codec ) switch( p_dec->fmt_in.i_codec )
......
modules/packetizer/mpeg4video.c
View file @ 4efefb82
...@@ -141,7 +141,7 @@ static int Open( vlc_object_t *p_this ) ...@@ -141,7 +141,7 @@ static int Open( vlc_object_t *p_this )
p_sys->b_frame = VLC_FALSE; p_sys->b_frame = VLC_FALSE;
/* Setup properties */ /* Setup properties */
p_dec->fmt_out = p_dec->fmt_in; es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in );
p_dec->fmt_out.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' ); p_dec->fmt_out.i_codec = VLC_FOURCC( 'm', 'p', '4', 'v' );
if( p_dec->fmt_in.i_extra ) if( p_dec->fmt_in.i_extra )
......
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