vlc/vlc-2.2 | branch: master | Francois Cartegnie <[email protected]> | Sat Aug  
9 14:19:24 2014 +0900| [a8fd9a2ef1decfbf7571e2f10c5ed3125757c965] | committer: 
Jean-Baptiste Kempf

demux: mp4: fix rmda/rmra box restrictions

comment was wrong

(cherry picked from commit 7f80a94dcf70d28b8ddedc7a86baaab32399a258)
Signed-off-by: Jean-Baptiste Kempf <[email protected]>

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

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

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index 6b00712..1bafd13 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3428,11 +3428,11 @@ static const struct
     /* found in hnti */
     { ATOM_rtp,     MP4_ReadBox_default,      NULL, 0 },
 
-    /* found in rmra */
-    { ATOM_rdrf,    MP4_ReadBox_rdrf,         MP4_FreeBox_rdrf  , ATOM_rmra },
-    { ATOM_rmdr,    MP4_ReadBox_rmdr,         MP4_FreeBox_Common, ATOM_rmra },
-    { ATOM_rmqu,    MP4_ReadBox_rmqu,         MP4_FreeBox_Common, ATOM_rmra },
-    { ATOM_rmvc,    MP4_ReadBox_rmvc,         MP4_FreeBox_Common, ATOM_rmra },
+    /* found in rmra/rmda */
+    { ATOM_rdrf,    MP4_ReadBox_rdrf,         MP4_FreeBox_rdrf  , ATOM_rmda },
+    { ATOM_rmdr,    MP4_ReadBox_rmdr,         MP4_FreeBox_Common, ATOM_rmda },
+    { ATOM_rmqu,    MP4_ReadBox_rmqu,         MP4_FreeBox_Common, ATOM_rmda },
+    { ATOM_rmvc,    MP4_ReadBox_rmvc,         MP4_FreeBox_Common, ATOM_rmda },
 
     { ATOM_drms,    MP4_ReadBox_sample_soun,  MP4_FreeBox_sample_soun, 0 },
     { ATOM_sinf,    MP4_ReadBoxContainer,     MP4_FreeBox_Common, 0 },

_______________________________________________
vlc-commits mailing list
[email protected]
https://mailman.videolan.org/listinfo/vlc-commits

Reply via email to