vlc | branch: master | Francois Cartegnie <[email protected]> | Mon Sep 29 15:37:08 2014 +0200| [ab27e26c207e1c7f4f687e349d46940c586db0bd] | committer: Francois Cartegnie
demux: libmp4: add mp4a/mp4v esds restrictions > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=ab27e26c207e1c7f4f687e349d46940c586db0bd --- modules/demux/mp4/libmp4.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c index a7c2de0..064f6f5 100644 --- a/modules/demux/mp4/libmp4.c +++ b/modules/demux/mp4/libmp4.c @@ -3390,7 +3390,7 @@ static const struct { ATOM_rmda, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_rmra }, { ATOM_tref, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_trak }, { ATOM_gmhd, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_minf }, - { ATOM_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common, 0 }, + { ATOM_wave, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_stsd }, { ATOM_ilst, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_meta }, { ATOM_mvex, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_moov }, { ATOM_mvex, MP4_ReadBoxContainer, MP4_FreeBox_Common, ATOM_ftyp }, @@ -3425,10 +3425,12 @@ static const struct { ATOM_padb, MP4_ReadBox_padb, MP4_FreeBox_padb, 0 }, { ATOM_elst, MP4_ReadBox_elst, MP4_FreeBox_elst, ATOM_edts }, { ATOM_cprt, MP4_ReadBox_cprt, MP4_FreeBox_cprt, 0 }, - { ATOM_esds, MP4_ReadBox_esds, MP4_FreeBox_esds, 0 }, + { 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_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, 0 }, + { ATOM_avcC, MP4_ReadBox_avcC, MP4_FreeBox_avcC, ATOM_avc1 }, { ATOM_hvcC, MP4_ReadBox_hvcC, MP4_FreeBox_hvcC, 0 }, { ATOM_dac3, MP4_ReadBox_dac3, MP4_FreeBox_Common, 0 }, { ATOM_dec3, MP4_ReadBox_dec3, MP4_FreeBox_Common, 0 }, _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
