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 | |
| 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>
| -rw-r--r-- | libavcodec/avcodec.h | 3 | ||||
| -rw-r--r-- | libavcodec/codec_desc.c | 9 | ||||
| -rw-r--r-- | libavcodec/version.h | 5 | ||||
| -rw-r--r-- | libavformat/riff.c | 2 |
4 files changed, 17 insertions, 2 deletions
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h index c7582e2788..2b98083020 100644 --- a/libavcodec/avcodec.h +++ b/libavcodec/avcodec.h @@ -419,7 +419,9 @@ enum AVCodecID { AV_CODEC_ID_MLP, AV_CODEC_ID_GSM_MS, /* as found in WAV */ AV_CODEC_ID_ATRAC3, +#if FF_API_VOXWARE AV_CODEC_ID_VOXWARE, +#endif AV_CODEC_ID_APE, AV_CODEC_ID_NELLYMOSER, AV_CODEC_ID_MUSEPACK8, @@ -451,6 +453,7 @@ enum AVCodecID { AV_CODEC_ID_OPUS_DEPRECATED, AV_CODEC_ID_COMFORT_NOISE, AV_CODEC_ID_TAK_DEPRECATED, + AV_CODEC_ID_METASOUND, AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'), AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'), AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'), 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", diff --git a/libavcodec/version.h b/libavcodec/version.h index 4b9a4b26ab..50eee90579 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,7 +29,7 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 22 +#define LIBAVCODEC_VERSION_MINOR 23 #define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ @@ -97,5 +97,8 @@ #ifndef FF_API_BUFS_VDPAU #define FF_API_BUFS_VDPAU (LIBAVCODEC_VERSION_MAJOR < 56) #endif +#ifndef FF_API_VOXWARE +#define FF_API_VOXWARE (LIBAVCODEC_VERSION_MAJOR < 56) +#endif #endif /* AVCODEC_VERSION_H */ diff --git a/libavformat/riff.c b/libavformat/riff.c index 84d97ed5c2..8bcf929365 100644 --- a/libavformat/riff.c +++ b/libavformat/riff.c @@ -384,7 +384,7 @@ const AVCodecTag ff_codec_wav_tags[] = { /* rogue format number */ { AV_CODEC_ID_ADPCM_IMA_DK3, 0x0062 }, { AV_CODEC_ID_ADPCM_IMA_WAV, 0x0069 }, - { AV_CODEC_ID_VOXWARE, 0x0075 }, + { AV_CODEC_ID_METASOUND, 0x0075 }, { AV_CODEC_ID_AAC, 0x00ff }, { AV_CODEC_ID_SIPR, 0x0130 }, { AV_CODEC_ID_WMAV1, 0x0160 }, |