[vlc-commits] Remove unsupported SONIC codec
Rémi Denis-Courmont
git at videolan.org
Sat Mar 9 11:32:48 CET 2013
vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat Mar 9 12:32:31 2013 +0200| [39de05b6b596d2be62c752203573dbc1c765aa6b] | committer: Rémi Denis-Courmont
Remove unsupported SONIC codec
> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=39de05b6b596d2be62c752203573dbc1c765aa6b
---
include/vlc_fourcc.h | 1 -
modules/codec/avcodec/fourcc.c | 4 ----
src/misc/fourcc.c | 3 ---
3 files changed, 8 deletions(-)
diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 65fe60a..8d29477 100644
--- 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 25c9f17..5046f02 100644
--- 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 1fa686e..9b6073b 100644
--- 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"),
More information about the vlc-commits
mailing list