diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 12:14:39 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-08-07 12:14:39 +0200 |
| commit | e4eab2d9bde330b9893a3291cb0d00c626a9ee8c (patch) | |
| tree | db03f89ac9f81ca2bcc685adf86e336cfacfde9e /libavcodec/codec_desc.c | |
| parent | 6bf6d6ad498d760bb60b6973789ebbf9758c999e (diff) | |
| parent | f544c586364e157e52ecc8697bee77d342150999 (diff) | |
| download | ffmpeg-e4eab2d9bde330b9893a3291cb0d00c626a9ee8c.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
deprecate AV_CODEC_ID_VOXWARE and introduce AV_CODEC_ID_METASOUND instead
Conflicts:
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 | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c index adc47727b0..ff468f6fcf 100644 --- a/libavcodec/codec_desc.c +++ b/libavcodec/codec_desc.c @@ -2132,6 +2132,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Atrac 3 (Adaptive TRansform Acoustic Coding 3)"), .props = AV_CODEC_PROP_LOSSY, }, +#if FF_API_VOXWARE { .id = AV_CODEC_ID_VOXWARE, .type = AVMEDIA_TYPE_AUDIO, @@ -2139,6 +2140,7 @@ static const AVCodecDescriptor codec_descriptors[] = { .long_name = NULL_IF_CONFIG_SMALL("Voxware RT29 Metasound"), .props = AV_CODEC_PROP_LOSSY, }, +#endif { .id = AV_CODEC_ID_APE, .type = AVMEDIA_TYPE_AUDIO, @@ -2389,6 +2391,13 @@ static const AVCodecDescriptor codec_descriptors[] = { .props = AV_CODEC_PROP_LOSSLESS, }, { + .id = AV_CODEC_ID_METASOUND, + .type = AVMEDIA_TYPE_AUDIO, + .name = "metasound", + .long_name = NULL_IF_CONFIG_SMALL("Voxware MetaSound"), + .props = AV_CODEC_PROP_LOSSY, + }, + { .id = AV_CODEC_ID_EVRC, .type = AVMEDIA_TYPE_AUDIO, .name = "evrc", |