From 4efefb826ef40d9cea26919b245d81e2976d1bd1 Mon Sep 17 00:00:00 2001 From: Gildas Bazin Date: Tue, 13 Apr 2004 10:52:29 +0000 Subject: [PATCH] * modules/packetizer/*: bug fix (use es_format_Copy() when necessary). --- modules/packetizer/copy.c | 8 +------- modules/packetizer/mpeg4video.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/modules/packetizer/copy.c b/modules/packetizer/copy.c index 87537475d6..24b8465681 100644 --- a/modules/packetizer/copy.c +++ b/modules/packetizer/copy.c @@ -75,13 +75,7 @@ static int Open( vlc_object_t *p_this ) p_dec->pf_packetize = Packetize; /* Create the output format */ - memcpy( &p_dec->fmt_out, &p_dec->fmt_in, sizeof( es_format_t ) ); - 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 ); - } + es_format_Copy( &p_dec->fmt_out, &p_dec->fmt_in ); /* Fix the value of the fourcc */ switch( p_dec->fmt_in.i_codec ) diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c index 1e85bdc8eb..a400910d98 100644 --- a/modules/packetizer/mpeg4video.c +++ b/modules/packetizer/mpeg4video.c @@ -141,7 +141,7 @@ static int Open( vlc_object_t *p_this ) p_sys->b_frame = VLC_FALSE; /* 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' ); if( p_dec->fmt_in.i_extra ) -- 2.39.2