Skip to content

V
vlc
Commit 4765bf1a authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont Committed by Rémi Denis-Courmont
Browse files
Options

Cleanup MP4 ftyp

parent 1608212e
Show whitespace changes
Inline Side-by-side
Showing with 10 additions and 3 deletions
modules/demux/mp4/libmp4.c
View file @ 4765bf1a
...@@ -352,6 +352,7 @@ static int MP4_ReadBoxSkip( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -352,6 +352,7 @@ static int MP4_ReadBoxSkip( stream_t *p_stream, MP4_Box_t *p_box )
static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box ) static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box )
{ {
unsigned code = 0;
MP4_READBOX_ENTER( MP4_Box_data_ftyp_t ); MP4_READBOX_ENTER( MP4_Box_data_ftyp_t );
MP4_GETFOURCC( p_box->data.p_ftyp->i_major_brand ); MP4_GETFOURCC( p_box->data.p_ftyp->i_major_brand );
...@@ -360,8 +361,12 @@ static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -360,8 +361,12 @@ static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box )
if( ( p_box->data.p_ftyp->i_compatible_brands_count = i_read / 4 ) ) if( ( p_box->data.p_ftyp->i_compatible_brands_count = i_read / 4 ) )
{ {
unsigned int i; unsigned int i;
p_box->data.p_ftyp->i_compatible_brands = uint32_t *tab = p_box->data.p_ftyp->i_compatible_brands =
calloc( p_box->data.p_ftyp->i_compatible_brands_count, sizeof(uint32_t)); calloc( p_box->data.p_ftyp->i_compatible_brands_count,
sizeof(uint32_t));
if( tab == NULL )
goto error;
for( i =0; i < p_box->data.p_ftyp->i_compatible_brands_count; i++ ) for( i =0; i < p_box->data.p_ftyp->i_compatible_brands_count; i++ )
{ {
...@@ -372,8 +377,10 @@ static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box ) ...@@ -372,8 +377,10 @@ static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box )
{ {
p_box->data.p_ftyp->i_compatible_brands = NULL; p_box->data.p_ftyp->i_compatible_brands = NULL;
} }
code = 1;
MP4_READBOX_EXIT( 1 ); error:
MP4_READBOX_EXIT( code );
} }
static void MP4_FreeBox_ftyp( MP4_Box_t *p_box ) static void MP4_FreeBox_ftyp( MP4_Box_t *p_box )
......
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