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
d42809f9
Commit
d42809f9
authored
Jul 24, 2016
by
Luca Barbato
Committed by
Diego Biurrun
Aug 24, 2016
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
av1: Add codec_id and basic demuxing support
Signed-off-by:
Diego Biurrun
<
diego@biurrun.de
>
parent
24130234
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
10 additions
and
0 deletions
+10
-0
avcodec.h
libavcodec/avcodec.h
+1
-0
codec_desc.c
libavcodec/codec_desc.c
+7
-0
matroska.c
libavformat/matroska.c
+1
-0
riff.c
libavformat/riff.c
+1
-0
No files found.
libavcodec/avcodec.h
View file @
d42809f9
...
@@ -391,6 +391,7 @@ enum AVCodecID {
...
@@ -391,6 +391,7 @@ enum AVCodecID {
AV_CODEC_ID_RSCC
,
AV_CODEC_ID_RSCC
,
AV_CODEC_ID_MAGICYUV
,
AV_CODEC_ID_MAGICYUV
,
AV_CODEC_ID_TRUEMOTION2RT
,
AV_CODEC_ID_TRUEMOTION2RT
,
AV_CODEC_ID_AV1
,
/* various PCM "codecs" */
/* various PCM "codecs" */
AV_CODEC_ID_FIRST_AUDIO
=
0x10000
,
///< A dummy id pointing at the start of audio codecs
AV_CODEC_ID_FIRST_AUDIO
=
0x10000
,
///< A dummy id pointing at the start of audio codecs
...
...
libavcodec/codec_desc.c
View file @
d42809f9
...
@@ -1205,6 +1205,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
...
@@ -1205,6 +1205,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Duck TrueMotion 2.0 Real Time"
),
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Duck TrueMotion 2.0 Real Time"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
.
props
=
AV_CODEC_PROP_LOSSY
,
},
},
{
.
id
=
AV_CODEC_ID_AV1
,
.
type
=
AVMEDIA_TYPE_VIDEO
,
.
name
=
"av1"
,
.
long_name
=
NULL_IF_CONFIG_SMALL
(
"Alliance for Open Media AV1"
),
.
props
=
AV_CODEC_PROP_LOSSY
,
},
/* image codecs */
/* image codecs */
{
{
...
...
libavformat/matroska.c
View file @
d42809f9
...
@@ -66,6 +66,7 @@ const CodecTags ff_mkv_codec_tags[]={
...
@@ -66,6 +66,7 @@ const CodecTags ff_mkv_codec_tags[]={
{
"S_DVBSUB"
,
AV_CODEC_ID_DVB_SUBTITLE
},
{
"S_DVBSUB"
,
AV_CODEC_ID_DVB_SUBTITLE
},
{
"S_HDMV/PGS"
,
AV_CODEC_ID_HDMV_PGS_SUBTITLE
},
{
"S_HDMV/PGS"
,
AV_CODEC_ID_HDMV_PGS_SUBTITLE
},
{
"V_AV1"
,
AV_CODEC_ID_AV1
},
{
"V_DIRAC"
,
AV_CODEC_ID_DIRAC
},
{
"V_DIRAC"
,
AV_CODEC_ID_DIRAC
},
{
"V_MJPEG"
,
AV_CODEC_ID_MJPEG
},
{
"V_MJPEG"
,
AV_CODEC_ID_MJPEG
},
{
"V_MPEG1"
,
AV_CODEC_ID_MPEG1VIDEO
},
{
"V_MPEG1"
,
AV_CODEC_ID_MPEG1VIDEO
},
...
...
libavformat/riff.c
View file @
d42809f9
...
@@ -367,6 +367,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
...
@@ -367,6 +367,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{
AV_CODEC_ID_RSCC
,
MKTAG
(
'R'
,
'S'
,
'C'
,
'C'
)
},
{
AV_CODEC_ID_RSCC
,
MKTAG
(
'R'
,
'S'
,
'C'
,
'C'
)
},
{
AV_CODEC_ID_RSCC
,
MKTAG
(
'I'
,
'S'
,
'C'
,
'C'
)
},
{
AV_CODEC_ID_RSCC
,
MKTAG
(
'I'
,
'S'
,
'C'
,
'C'
)
},
{
AV_CODEC_ID_MAGICYUV
,
MKTAG
(
'M'
,
'A'
,
'G'
,
'Y'
)
},
{
AV_CODEC_ID_MAGICYUV
,
MKTAG
(
'M'
,
'A'
,
'G'
,
'Y'
)
},
{
AV_CODEC_ID_AV1
,
MKTAG
(
'A'
,
'V'
,
'0'
,
'1'
)
},
{
AV_CODEC_ID_NONE
,
0
}
{
AV_CODEC_ID_NONE
,
0
}
};
};
...
...
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