[vlc-commits] demux: mp4: add restriction for frma atom

Francois Cartegnie git at videolan.org
Mon Sep 29 15:48:54 CEST 2014


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Sep 27 19:33:37 2014 +0200| [9b2d5c0f234aceb910c96edfd064716d5a7d7732] | committer: Francois Cartegnie

demux: mp4: add restriction for frma atom

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

 modules/demux/mp4/libmp4.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 84b3f80..a7c2de0 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3547,7 +3547,7 @@ static const struct
     { ATOM_key,     MP4_ReadBox_drms,         MP4_FreeBox_Common, 0 },
     { ATOM_iviv,    MP4_ReadBox_drms,         MP4_FreeBox_Common, 0 },
     { ATOM_priv,    MP4_ReadBox_drms,         MP4_FreeBox_Common, 0 },
-    { ATOM_frma,    MP4_ReadBox_frma,         MP4_FreeBox_Common, 0 },
+    { ATOM_frma,    MP4_ReadBox_frma,         MP4_FreeBox_Common, ATOM_sinf }, /* and rinf */
     { ATOM_skcr,    MP4_ReadBox_skcr,         MP4_FreeBox_Common, 0 },
 
     /* found in udta */



More information about the vlc-commits mailing list