RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-13 02:41:37 +00:00
Code Issues Projects Releases Wiki Activity

Merge commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb'

Browse Source 
* commit 'd42809f9835a4e9e5c7c63210abb09ad0ef19cfb':
  av1: Add codec_id and basic demuxing support

Merged-by: Clément Bœsch <u@pkh.me>
This commit is contained in:
Clément Bœsch 2017-03-19 18:28:40 +01:00
commit ed223eeab3
4 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/avcodec.h
View File

@ -440,6 +440,7 @@ enum AVCodecID {
AV_CODEC_ID_SCPR, AV_CODEC_ID_SCPR,
AV_CODEC_ID_CLEARVIDEO, AV_CODEC_ID_CLEARVIDEO,
AV_CODEC_ID_XPM, AV_CODEC_ID_XPM,
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

7
libavcodec/codec_desc.c
View File

@ -1374,6 +1374,13 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Iterated Systems ClearVideo"), .long_name = NULL_IF_CONFIG_SMALL("Iterated Systems ClearVideo"),
.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 */
{ {

1
libavformat/matroska.c
View File

@ -77,6 +77,7 @@ const CodecTags ff_mkv_codec_tags[]={
{"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE}, {"S_HDMV/PGS" , AV_CODEC_ID_HDMV_PGS_SUBTITLE},
{"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE}, {"S_HDMV/TEXTST" , AV_CODEC_ID_HDMV_TEXT_SUBTITLE},
{"V_AV1" , AV_CODEC_ID_AV1},
{"V_DIRAC" , AV_CODEC_ID_DIRAC}, {"V_DIRAC" , AV_CODEC_ID_DIRAC},
{"V_FFV1" , AV_CODEC_ID_FFV1}, {"V_FFV1" , AV_CODEC_ID_FFV1},
{"V_MJPEG" , AV_CODEC_ID_MJPEG}, {"V_MJPEG" , AV_CODEC_ID_MJPEG},

2
libavformat/riff.c
View File

@ -451,7 +451,7 @@ const AVCodecTag ff_codec_bmp_tags[] = {
{ AV_CODEC_ID_FMVC, MKTAG('F', 'M', 'V', 'C') }, { AV_CODEC_ID_FMVC, MKTAG('F', 'M', 'V', 'C') },
{ AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') }, { AV_CODEC_ID_SCPR, MKTAG('S', 'C', 'P', 'R') },
{ AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') }, { AV_CODEC_ID_CLEARVIDEO, MKTAG('U', 'C', 'O', 'D') },
{ AV_CODEC_ID_AV1, MKTAG('A', 'V', '0', '1') },
{ AV_CODEC_ID_NONE, 0 } { AV_CODEC_ID_NONE, 0 }
}; };