Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
4f3db5d3
Commit
4f3db5d3
authored
Mar 03, 2014
by
Tim Walker
Committed by
Vittorio Giovara
Mar 09, 2014
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
movenc: allow muxing HEVC in MODE_MP4.
parent
b6c61fb8
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
0 deletions
+2
-0
isom.c
libavformat/isom.c
+1
-0
movenc.c
libavformat/movenc.c
+1
-0
No files found.
libavformat/isom.c
View file @
4f3db5d3
...
@@ -33,6 +33,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
...
@@ -33,6 +33,7 @@ const AVCodecTag ff_mp4_obj_type[] = {
{
AV_CODEC_ID_MOV_TEXT
,
0x08
},
{
AV_CODEC_ID_MOV_TEXT
,
0x08
},
{
AV_CODEC_ID_MPEG4
,
0x20
},
{
AV_CODEC_ID_MPEG4
,
0x20
},
{
AV_CODEC_ID_H264
,
0x21
},
{
AV_CODEC_ID_H264
,
0x21
},
{
AV_CODEC_ID_HEVC
,
0x23
},
{
AV_CODEC_ID_AAC
,
0x40
},
{
AV_CODEC_ID_AAC
,
0x40
},
{
AV_CODEC_ID_MP4ALS
,
0x40
},
/* 14496-3 ALS */
{
AV_CODEC_ID_MP4ALS
,
0x40
},
/* 14496-3 ALS */
{
AV_CODEC_ID_MPEG2VIDEO
,
0x61
},
/* MPEG2 Main */
{
AV_CODEC_ID_MPEG2VIDEO
,
0x61
},
/* MPEG2 Main */
...
...
libavformat/movenc.c
View file @
4f3db5d3
...
@@ -752,6 +752,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track)
...
@@ -752,6 +752,7 @@ static int mp4_get_codec_tag(AVFormatContext *s, MOVTrack *track)
return
0
;
return
0
;
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_H264
)
tag
=
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
);
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_H264
)
tag
=
MKTAG
(
'a'
,
'v'
,
'c'
,
'1'
);
else
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_HEVC
)
tag
=
MKTAG
(
'h'
,
'e'
,
'v'
,
'1'
);
else
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_AC3
)
tag
=
MKTAG
(
'a'
,
'c'
,
'-'
,
'3'
);
else
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_AC3
)
tag
=
MKTAG
(
'a'
,
'c'
,
'-'
,
'3'
);
else
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_DIRAC
)
tag
=
MKTAG
(
'd'
,
'r'
,
'a'
,
'c'
);
else
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_DIRAC
)
tag
=
MKTAG
(
'd'
,
'r'
,
'a'
,
'c'
);
else
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_MOV_TEXT
)
tag
=
MKTAG
(
't'
,
'x'
,
'3'
,
'g'
);
else
if
(
track
->
enc
->
codec_id
==
AV_CODEC_ID_MOV_TEXT
)
tag
=
MKTAG
(
't'
,
'x'
,
'3'
,
'g'
);
...
...
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