Cleanup MP4 ftyp

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index e96fdd0f1dc832108a22e6ffe907ba156837b5a6..2ab2dc9b4f0d55ccd0b647d823a9adcbf0455781 100644 (file)
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -369,6 +369,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 )
 {
+    unsigned code = 0;
     MP4_READBOX_ENTER( MP4_Box_data_ftyp_t );
 
     MP4_GETFOURCC( p_box->data.p_ftyp->i_major_brand );
@@ -382,7 +383,7 @@ static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box )
                     sizeof(uint32_t));
 
         if( tab == NULL )
-            p_box->data.p_ftyp->i_compatible_brands_count = 0;
+            goto error;
 
         for( i =0; i < p_box->data.p_ftyp->i_compatible_brands_count; i++ )
         {
@@ -393,8 +394,10 @@ static int MP4_ReadBox_ftyp( stream_t *p_stream, MP4_Box_t *p_box )
     {
         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 )