Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
c3b13251
Commit
c3b13251
authored
Sep 03, 2008
by
Baptiste Coudurier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
dirac muxing support in mp4/mov
Originally committed as revision 15188 to
svn://svn.ffmpeg.org/ffmpeg/trunk
parent
5180b027
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
0 deletions
+3
-0
isom.c
libavformat/isom.c
+2
-0
movenc.c
libavformat/movenc.c
+1
-0
No files found.
libavformat/isom.c
View file @
c3b13251
...
...
@@ -48,6 +48,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
{
CODEC_ID_PNG
,
0x6D
},
{
CODEC_ID_JPEG2000
,
0x6E
},
/* 15444-1 */
{
CODEC_ID_VC1
,
0xA3
},
{
CODEC_ID_DIRAC
,
0xA4
},
{
CODEC_ID_AC3
,
0xA5
},
{
CODEC_ID_VORBIS
,
0xDD
},
/* non standard, gpac uses it */
{
CODEC_ID_DVD_SUBTITLE
,
0xE0
},
/* non standard, see unsupported-embedded-subs-2.mp4 */
...
...
@@ -155,6 +156,7 @@ const AVCodecTag codec_movvideo_tags[] = {
{
CODEC_ID_VC1
,
MKTAG
(
'v'
,
'c'
,
'-'
,
'1'
)
},
/* SMPTE RP 2025 */
{
CODEC_ID_CAVS
,
MKTAG
(
'a'
,
'v'
,
's'
,
'2'
)
},
{
CODEC_ID_DIRAC
,
MKTAG
(
'd'
,
'r'
,
'a'
,
'c'
)
},
{
CODEC_ID_DNXHD
,
MKTAG
(
'A'
,
'V'
,
'd'
,
'n'
)
},
/* AVID DNxHD */
{
CODEC_ID_SGI
,
MKTAG
(
's'
,
'g'
,
'i'
,
' '
)
},
/* SGI */
...
...
libavformat/movenc.c
View file @
c3b13251
...
...
@@ -574,6 +574,7 @@ static int mov_find_codec_tag(AVFormatContext *s, MOVTrack *track)
return
0
;
if
(
track
->
enc
->
codec_id
==
CODEC_ID_H264
)
tag
=
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
);
else
if
(
track
->
enc
->
codec_id
==
CODEC_ID_AC3
)
tag
=
MKTAG
(
'a'
,
'c'
,
'-'
,
'3'
);
else
if
(
track
->
enc
->
codec_id
==
CODEC_ID_DIRAC
)
tag
=
MKTAG
(
'd'
,
'r'
,
'a'
,
'c'
);
else
if
(
track
->
enc
->
codec_type
==
CODEC_TYPE_VIDEO
)
tag
=
MKTAG
(
'm'
,
'p'
,
'4'
,
'v'
);
else
if
(
track
->
enc
->
codec_type
==
CODEC_TYPE_AUDIO
)
tag
=
MKTAG
(
'm'
,
'p'
,
'4'
,
'a'
);
}
else
if
(
track
->
mode
==
MODE_IPOD
)
{
...
...
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