[vlc-commits] mp4: do not assume demux has an input

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Mon Nov 13 19:42:51 2017 +0200| [1bdc3729d0ab1850f09ca6f9721619b281ea02df] | committer: Rémi Denis-Courmont

mp4: do not assume demux has an input

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1bdc3729d0ab1850f09ca6f9721619b281ea02df
---

 modules/demux/mp4/mp4.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/demux/mp4/mp4.c b/modules/demux/mp4/mp4.c
index 67a1ca9633..c183cb4973 100644
--- a/modules/demux/mp4/mp4.c
+++ b/modules/demux/mp4/mp4.c
@@ -625,7 +625,6 @@ static int Open( vlc_object_t * p_this )
     const uint8_t   *p_peek;
 
     MP4_Box_t       *p_ftyp;
-    MP4_Box_t       *p_rmra;
     const MP4_Box_t *p_mvhd = NULL;
     const MP4_Box_t *p_mvex = NULL;
 
@@ -760,7 +759,8 @@ static int Open( vlc_object_t * p_this )
         goto error;
     }
 
-    if( ( p_rmra = MP4_BoxGet( p_sys->p_root,  "/moov/rmra" ) ) )
+    MP4_Box_t *p_rmra = MP4_BoxGet( p_sys->p_root, "/moov/rmra" );
+    if( p_rmra != NULL && p_demux->p_input != NULL )
     {
         int        i_count = MP4_BoxCount( p_rmra, "rmda" );
         int        i;