Commit 1c64e88c authored by Francois Cartegnie's avatar Francois Cartegnie

demux: libmp4: add vc1 atom parsing restrictions

parent c0660ee3
......@@ -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 },
......
......@@ -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', ' ' )
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment