[FFmpeg-cvslog] Remove 8SVX_RAW on next lavc mayor bump

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Mon Dec 10 16:18:12 2012 +0000| [f4fe4fa89f0b1ccdf456c822f0a8bf008545561f] | committer: Paul B Mahol

Remove 8SVX_RAW on next lavc mayor bump

Signed-off-by: Paul B Mahol <onemda at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f4fe4fa89f0b1ccdf456c822f0a8bf008545561f
---

 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 5865aa3..a1200c7 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",