diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-04-23 20:47:13 +0200 |
| commit | 56efd98a6574641a32f08cd5123725cef28a309b (patch) | |
| tree | 27a85d0dc0eb40d0ad99e96bb7684514be3da44f /libavcodec/codec_desc.c | |
| parent | ecb815e5117f3353ed3e67bb737029773d170212 (diff) | |
| parent | e2834567d73bd1e46478ba67ac133cb8ef5f50fd (diff) | |
| download | ffmpeg-56efd98a6574641a32f08cd5123725cef28a309b.tar.gz | |
Merge commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd'
* commit 'e2834567d73bd1e46478ba67ac133cb8ef5f50fd':
On2 AVC decoder
Conflicts:
Changelog
configure
libavcodec/avcodec.h
libavcodec/codec_desc.c
libavcodec/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/codec_desc.c')
| -rw-r--r-- | libavcodec/codec_desc.c | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index 20c0160f2c..8785e3a810 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2447,6 +2447,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSY, }, { + .id = AV_CODEC_ID_ON2AVC, + .type = AVMEDIA_TYPE_AUDIO, + .name = "avc", + .long_name = NULL_IF_CONFIG_SMALL("On2 Audio for Video Codec"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_EVRC, .type = AVMEDIA_TYPE_AUDIO, .name = "evrc", |