[vlc-commits] demux: libmp4: add vc1 atom parsing restrictions

[Francois Cartegnie]

vlc | branch: master | Francois Cartegnie <fcvlcdev at free.fr> | Sat Oct 31 12:53:30 2015 +0100| [1c64e88c54450029eecf53b16ca77658eb8a6179] | committer: Francois Cartegnie

demux: libmp4: add vc1 atom parsing restrictions

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

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

diff --git a/modules/demux/mp4/libmp4.c b/modules/demux/mp4/libmp4.c
index e902ac8..16ec55ac 100644
--- a/modules/demux/mp4/libmp4.c
+++ b/modules/demux/mp4/libmp4.c
@@ -3739,7 +3739,7 @@ static const struct
     { ATOM_hvcC,    MP4_ReadBox_Binary,       0 },
     { ATOM_dac3,    MP4_ReadBox_dac3,         0 },
     { ATOM_dec3,    MP4_ReadBox_dec3,         0 },
-    { ATOM_dvc1,    MP4_ReadBox_dvc1,         0 },
+    { ATOM_dvc1,    MP4_ReadBox_dvc1,         ATOM_vc1  },
     { ATOM_fiel,    MP4_ReadBox_fiel,         0 },
     { ATOM_glbl,    MP4_ReadBox_Binary,       ATOM_FFV1 },
     { ATOM_enda,    MP4_ReadBox_enda,         0 },
@@ -3841,6 +3841,7 @@ static const struct
     { ATOM_h264,    MP4_ReadBox_sample_vide,  ATOM_stsd },
 
     { ATOM_jpeg,    MP4_ReadBox_sample_vide,  ATOM_stsd },
+    { ATOM_vc1,     MP4_ReadBox_sample_vide,  ATOM_stsd },
     { ATOM_avc1,    MP4_ReadBox_sample_vide,  ATOM_stsd },
     { ATOM_avc3,    MP4_ReadBox_sample_vide,  ATOM_stsd },
 
diff --git a/modules/demux/mp4/libmp4.h b/modules/demux/mp4/libmp4.h
index 62a6b30..75d89a1 100644
--- a/modules/demux/mp4/libmp4.h
+++ b/modules/demux/mp4/libmp4.h
@@ -162,6 +162,7 @@ typedef int64_t stime_t;
 #define ATOM_eac3 VLC_FOURCC( 'e', 'c', '-', '3' )
 #define ATOM_dac3 VLC_FOURCC( 'd', 'a', 'c', '3' )
 #define ATOM_dec3 VLC_FOURCC( 'd', 'e', 'c', '3' )
+#define ATOM_vc1  VLC_FOURCC( 'v', 'c', '-', '1' )
 #define ATOM_dvc1 VLC_FOURCC( 'd', 'v', 'c', '1' )
 #define ATOM_WMA2 VLC_FOURCC( 'W', 'M', 'A', '2' )
 #define ATOM_wma  VLC_FOURCC( 'w', 'm', 'a', ' ' )