[vlc-commits] demux: mp4: correctly match release function

[Francois Cartegnie]

vlc/vlc-2.2 | branch: master | Francois Cartegnie <fcartegnie at free.fr> | Mon Aug  3 15:17:32 2015 +0200| [ce91452460a75d7424b165c4dc8db98114c3cbd9] | committer: Jean-Baptiste Kempf

demux: mp4: correctly match release function

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 modules/demux/mp4/libmp4.c |    5 +++++
 1 file changed, 5 insertions(+)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 331262b..f220e51 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3643,6 +3643,11 @@ void MP4_BoxFree( stream_t *s, MP4_Box_t *p_box )
     {
         for( i_index = 0; ; i_index++ )
         {
+            if ( MP4_Box_Function[i_index].i_parent &&
+                 p_box->p_father &&
+                 p_box->p_father->i_type != MP4_Box_Function[i_index].i_parent )
+                continue;
+
             if( ( MP4_Box_Function[i_index].i_type == p_box->i_type )||
                 ( MP4_Box_Function[i_index].i_type == 0 ) )
             {