[FFmpeg-devel] [PATCH] Remove 8SVX_RAW on next lavc mayor bump
Paul B Mahol
onemda at gmail.com
Mon Dec 10 17:19:15 CET 2012
Signed-off-by: Paul B Mahol <onemda at gmail.com>
---
libavcodec/avcodec.h | 2 ++
libavcodec/codec_desc.c | 6 ------
2 files changed, 2 insertions(+), 6 deletions(-)
diff --git a/libavcodec/avcodec.h b/libavcodec/avcodec.h
index e432040..edb9ac7 100644
--- a/libavcodec/avcodec.h
+++ b/libavcodec/avcodec.h
@@ -435,7 +435,9 @@ enum AVCodecID {
AV_CODEC_ID_COMFORT_NOISE,
AV_CODEC_ID_TAK_DEPRECATED,
AV_CODEC_ID_FFWAVESYNTH = MKBETAG('F','F','W','S'),
+#if LIBAVCODEC_VERSION_MAJOR <= 54
AV_CODEC_ID_8SVX_RAW = MKBETAG('8','S','V','X'),
+#endif
AV_CODEC_ID_SONIC = MKBETAG('S','O','N','C'),
AV_CODEC_ID_SONIC_LS = MKBETAG('S','O','N','L'),
AV_CODEC_ID_PAF_AUDIO = MKBETAG('P','A','F','A'),
diff --git a/libavcodec/codec_desc.c b/libavcodec/codec_desc.c
index 8e8685c..a0a44b7 100644
--- a/libavcodec/codec_desc.c
+++ b/libavcodec/codec_desc.c
@@ -2276,12 +2276,6 @@ static const AVCodecDescriptor codec_descriptors[] = {
.long_name = NULL_IF_CONFIG_SMALL("Wave synthesis pseudo-codec"),
},
{
- .id = AV_CODEC_ID_8SVX_RAW,
- .type = AVMEDIA_TYPE_AUDIO,
- .name = "8svx_raw",
- .long_name = NULL_IF_CONFIG_SMALL("8SVX raw"),
- },
- {
.id = AV_CODEC_ID_SONIC,
.type = AVMEDIA_TYPE_AUDIO,
.name = "sonic",
--
1.7.11.4
More information about the ffmpeg-devel
mailing list