[vlc-commits] demux: libmp4: add missing subtitles mp4s atom rule

Francois Cartegnie git at videolan.org
Tue Oct 14 20:26:52 CEST 2014


vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Tue Oct 14 19:27:55 2014 +0200| [408710f06c1deebbf55c201fb0b10b522cc2b824] | committer: Francois Cartegnie

demux: libmp4: add missing subtitles mp4s atom rule

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

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

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index ad7d699..7e9afd8 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3533,6 +3533,7 @@ static const struct
     { ATOM_esds,    MP4_ReadBox_esds,         MP4_FreeBox_esds, ATOM_wave }, /* mp4a in wave chunk */
     { ATOM_esds,    MP4_ReadBox_esds,         MP4_FreeBox_esds, ATOM_mp4a },
     { ATOM_esds,    MP4_ReadBox_esds,         MP4_FreeBox_esds, ATOM_mp4v },
+    { ATOM_esds,    MP4_ReadBox_esds,         MP4_FreeBox_esds, ATOM_mp4s },
     { ATOM_dcom,    MP4_ReadBox_dcom,         MP4_FreeBox_Common, 0 },
     { ATOM_cmvd,    MP4_ReadBox_cmvd,         MP4_FreeBox_cmvd, 0 },
     { ATOM_avcC,    MP4_ReadBox_avcC,         MP4_FreeBox_avcC, ATOM_avc1 },
@@ -3634,7 +3635,7 @@ static const struct
     { ATOM_ASF ,    MP4_ReadBox_ASF,          MP4_FreeBox_Common,      ATOM_WMV3 }, /* flip4mac */
     { ATOM_ASF ,    MP4_ReadBox_ASF,          MP4_FreeBox_Common,      ATOM_wave }, /* flip4mac */
 
-    { ATOM_mp4s,    MP4_ReadBox_sample_mp4s,  MP4_FreeBox_Common, 0 },
+    { ATOM_mp4s,    MP4_ReadBox_sample_mp4s,  MP4_FreeBox_Common,      ATOM_stsd },
 
     /* XXX there is 2 box where we could find this entry stbl and tref*/
     { ATOM_hint,    MP4_ReadBox_default,      MP4_FreeBox_Common, 0 },



More information about the vlc-commits mailing list