X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=inline;f=modules%2Fpacketizer%2Fmpeg4video.c;h=82bcd5d10befb35acf2e0ab65c830f69cada764e;hb=724c4e4a7df2aee1d37c9f6ac59f32b64ac70f7b;hp=32daa37dfb26fd1c718e531d0b212f4600f022b6;hpb=658686029ee756fbf4beb8e0cdcc4b0bc5dd18ed;p=vlc diff --git a/modules/packetizer/mpeg4video.c b/modules/packetizer/mpeg4video.c index 32daa37dfb..82bcd5d10b 100644 --- a/modules/packetizer/mpeg4video.c +++ b/modules/packetizer/mpeg4video.c @@ -37,8 +37,8 @@ #include #include -#include "vlc_bits.h" -#include "vlc_block_helper.h" +#include +#include #include "packetizer_helper.h" /***************************************************************************** @@ -156,7 +156,7 @@ static int Open( vlc_object_t *p_this ) { /* We have a vol */ p_dec->fmt_out.i_extra = p_dec->fmt_in.i_extra; - p_dec->fmt_out.p_extra = malloc( p_dec->fmt_in.i_extra ); + p_dec->fmt_out.p_extra = xmalloc( 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 ); @@ -287,7 +287,7 @@ static block_t *ParseMPEGBlock( decoder_t *p_dec, block_t *p_frag ) if( (size_t)p_dec->fmt_out.i_extra != p_frag->i_buffer ) { p_dec->fmt_out.p_extra = - realloc( p_dec->fmt_out.p_extra, p_frag->i_buffer ); + xrealloc( p_dec->fmt_out.p_extra, p_frag->i_buffer ); p_dec->fmt_out.i_extra = p_frag->i_buffer; } memcpy( p_dec->fmt_out.p_extra, p_frag->p_buffer, p_frag->i_buffer );