Remove unsupported SONIC codec

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 65fe60ada0caac36f5a722318f5c07bb16a44d3e..8d294778634e58d12047fef9369f2373f72cee3c 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -303,7 +303,6 @@
 #define VLC_CODEC_GSM_MS                     VLC_FOURCC('a','g','s','m')
 #define VLC_CODEC_ATRAC1                     VLC_FOURCC('a','t','r','1')
 #define VLC_CODEC_ATRAC3                     VLC_FOURCC('a','t','r','c')
-#define VLC_CODEC_SONIC                      VLC_FOURCC('S','O','N','C')
 #define VLC_CODEC_IMC                        VLC_FOURCC(0x1,0x4,0x0,0x0)
 #define VLC_CODEC_TRUESPEECH                 VLC_FOURCC(0x22,0x0,0x0,0x0)
 #define VLC_CODEC_NELLYMOSER                 VLC_FOURCC('N','E','L','L')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index 25c9f174a94c2a933b3b219d67fa16550e885d12..5046f02550ea1deae3e53b0bffeb14c4ee679c46 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -361,10 +361,6 @@ static const struct
 
     { VLC_CODEC_ATRAC3, CODEC_ID_ATRAC3, AUDIO_ES },
 
-#if LIBAVCODEC_VERSION_MAJOR < 54
-    { VLC_CODEC_SONIC, CODEC_ID_SONIC, AUDIO_ES },
-#endif
-
     { VLC_CODEC_IMC, CODEC_ID_IMC, AUDIO_ES },
 
     { VLC_CODEC_TRUESPEECH, CODEC_ID_TRUESPEECH, AUDIO_ES },

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index 1fa686e7d856e46191fffb6ff19b6074418157ce..9b6073b11820f2e3d708209cd5da71053f981087 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -1198,9 +1198,6 @@ static const staticentry_t p_list_audio[] = {
         A("atrc"),
         A("\x70\x02\x00\x00"),
 
-    B(VLC_CODEC_SONIC, "Sonic"),
-        A("SONC"),
-
     B(VLC_CODEC_IMC, "IMC" ),
         A("\x01\x04\x00\x00"),