Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
904dc08f
Commit
904dc08f
authored
Dec 24, 2014
by
Francois Cartegnie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
demux: mp4: handle avc3
parent
9ef79c68
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
4 additions
and
0 deletions
+4
-0
modules/demux/mp4/essetup.c
modules/demux/mp4/essetup.c
+1
-0
modules/demux/mp4/libmp4.c
modules/demux/mp4/libmp4.c
+2
-0
modules/demux/mp4/libmp4.h
modules/demux/mp4/libmp4.h
+1
-0
No files found.
modules/demux/mp4/essetup.c
View file @
904dc08f
...
@@ -286,6 +286,7 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
...
@@ -286,6 +286,7 @@ int SetupVideoES( demux_t *p_demux, mp4_track_t *p_track, MP4_Box_t *p_sample )
}
}
/* avc1: send avcC (h264 without annexe B, ie without start code)*/
/* avc1: send avcC (h264 without annexe B, ie without start code)*/
case
VLC_FOURCC
(
'a'
,
'v'
,
'c'
,
'3'
):
case
VLC_FOURCC
(
'a'
,
'v'
,
'c'
,
'1'
):
case
VLC_FOURCC
(
'a'
,
'v'
,
'c'
,
'1'
):
{
{
MP4_Box_t
*
p_avcC
=
MP4_BoxGet
(
p_sample
,
"avcC"
);
MP4_Box_t
*
p_avcC
=
MP4_BoxGet
(
p_sample
,
"avcC"
);
...
...
modules/demux/mp4/libmp4.c
View file @
904dc08f
...
@@ -3661,6 +3661,7 @@ static const struct
...
@@ -3661,6 +3661,7 @@ static const struct
{
ATOM_dcom
,
MP4_ReadBox_dcom
,
MP4_FreeBox_Common
,
0
},
{
ATOM_dcom
,
MP4_ReadBox_dcom
,
MP4_FreeBox_Common
,
0
},
{
ATOM_cmvd
,
MP4_ReadBox_cmvd
,
MP4_FreeBox_cmvd
,
0
},
{
ATOM_cmvd
,
MP4_ReadBox_cmvd
,
MP4_FreeBox_cmvd
,
0
},
{
ATOM_avcC
,
MP4_ReadBox_avcC
,
MP4_FreeBox_avcC
,
ATOM_avc1
},
{
ATOM_avcC
,
MP4_ReadBox_avcC
,
MP4_FreeBox_avcC
,
ATOM_avc1
},
{
ATOM_avcC
,
MP4_ReadBox_avcC
,
MP4_FreeBox_avcC
,
ATOM_avc3
},
{
ATOM_hvcC
,
MP4_ReadBox_hvcC
,
MP4_FreeBox_hvcC
,
0
},
{
ATOM_hvcC
,
MP4_ReadBox_hvcC
,
MP4_FreeBox_hvcC
,
0
},
{
ATOM_dac3
,
MP4_ReadBox_dac3
,
MP4_FreeBox_Common
,
0
},
{
ATOM_dac3
,
MP4_ReadBox_dac3
,
MP4_FreeBox_Common
,
0
},
{
ATOM_dec3
,
MP4_ReadBox_dec3
,
MP4_FreeBox_Common
,
0
},
{
ATOM_dec3
,
MP4_ReadBox_dec3
,
MP4_FreeBox_Common
,
0
},
...
@@ -3757,6 +3758,7 @@ static const struct
...
@@ -3757,6 +3758,7 @@ static const struct
{
ATOM_jpeg
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
ATOM_stsd
},
{
ATOM_jpeg
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
ATOM_stsd
},
{
ATOM_avc1
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
ATOM_stsd
},
{
ATOM_avc1
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
ATOM_stsd
},
{
ATOM_avc3
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
ATOM_stsd
},
{
ATOM_yv12
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
0
},
{
ATOM_yv12
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
0
},
{
ATOM_yuv2
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
0
},
{
ATOM_yuv2
,
MP4_ReadBox_sample_vide
,
MP4_FreeBox_sample_vide
,
0
},
...
...
modules/demux/mp4/libmp4.h
View file @
904dc08f
...
@@ -194,6 +194,7 @@
...
@@ -194,6 +194,7 @@
#define ATOM_WMV3 VLC_FOURCC( 'W', 'M', 'V', '3' )
#define ATOM_WMV3 VLC_FOURCC( 'W', 'M', 'V', '3' )
#define ATOM_avc1 VLC_FOURCC( 'a', 'v', 'c', '1' )
#define ATOM_avc1 VLC_FOURCC( 'a', 'v', 'c', '1' )
#define ATOM_avc3 VLC_FOURCC( 'a', 'v', 'c', '3' )
#define ATOM_avcC VLC_FOURCC( 'a', 'v', 'c', 'C' )
#define ATOM_avcC VLC_FOURCC( 'a', 'v', 'c', 'C' )
#define ATOM_m4ds VLC_FOURCC( 'm', '4', 'd', 's' )
#define ATOM_m4ds VLC_FOURCC( 'm', '4', 'd', 's' )
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment