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
3d96a1ab
Commit
3d96a1ab
authored
Mar 27, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
MP4: support for more codecs in mp4
According to
http://www.mp4ra.org/object.html
(not tested)
parent
f6dd8d2f
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
13 additions
and
1 deletion
+13
-1
modules/demux/mp4/mp4.c
modules/demux/mp4/mp4.c
+13
-1
No files found.
modules/demux/mp4/mp4.c
View file @
3d96a1ab
...
...
@@ -1852,6 +1852,9 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
case
(
0x20
):
/* MPEG4 VIDEO */
p_track
->
fmt
.
i_codec
=
VLC_FOURCC
(
'm'
,
'p'
,
'4'
,
'v'
);
break
;
case
(
0x21
):
/* H.264 */
p_track
->
fmt
.
i_codec
=
VLC_CODEC_H264
;
break
;
case
(
0x40
):
p_track
->
fmt
.
i_codec
=
VLC_FOURCC
(
'm'
,
'p'
,
'4'
,
'a'
);
if
(
p_decconfig
->
i_decoder_specific_info_len
>=
2
&&
...
...
@@ -1891,12 +1894,21 @@ static int TrackCreateES( demux_t *p_demux, mp4_track_t *p_track,
case
(
0x6d
):
/* png */
p_track
->
fmt
.
i_codec
=
VLC_FOURCC
(
'p'
,
'n'
,
'g'
,
' '
);
break
;
case
(
0x6e
):
/* jpeg200 */
case
(
0x6e
):
/* jpeg200
0
*/
p_track
->
fmt
.
i_codec
=
VLC_FOURCC
(
'M'
,
'J'
,
'2'
,
'C'
);
break
;
case
(
0xa3
):
/* vc1 */
p_track
->
fmt
.
i_codec
=
VLC_FOURCC
(
'W'
,
'V'
,
'C'
,
'1'
);
break
;
case
(
0xa4
):
p_track
->
fmt
.
i_codec
=
VLC_CODEC_DIRAC
;
break
;
case
(
0xa5
):
p_track
->
fmt
.
i_codec
=
VLC_CODEC_A52
;
break
;
case
(
0xa6
):
p_track
->
fmt
.
i_codec
=
VLC_CODEC_EAC3
;
break
;
case
(
0xa9
):
/* dts */
case
(
0xaa
):
/* DTS-HD HRA */
case
(
0xab
):
/* DTS-HD Master Audio */
...
...
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