Drop aborted SNOW codec

This is not supported in libavcodec anymore.

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 9fc887aa9496e64e0299102493aaaf5cb5710fea..65fe60ada0caac36f5a722318f5c07bb16a44d3e 100644 (file)
--- a/include/vlc_fourcc.h
+++ b/include/vlc_fourcc.h
@@ -52,7 +52,6 @@
 #define VLC_CODEC_VC1             VLC_FOURCC('V','C','-','1')
 #define VLC_CODEC_THEORA          VLC_FOURCC('t','h','e','o')
 #define VLC_CODEC_TARKIN          VLC_FOURCC('t','a','r','k')
-#define VLC_CODEC_SNOW            VLC_FOURCC('S','N','O','W')
 #define VLC_CODEC_DIRAC           VLC_FOURCC('d','r','a','c')
 #define VLC_CODEC_CAVS            VLC_FOURCC('C','A','V','S')
 #define VLC_CODEC_NUV             VLC_FOURCC('N','J','P','G')

diff --git a/modules/codec/avcodec/fourcc.c b/modules/codec/avcodec/fourcc.c
index db7586035f9e6217b5d0defa9265b20f9ad49423..25c9f174a94c2a933b3b219d67fa16550e885d12 100644 (file)
--- a/modules/codec/avcodec/fourcc.c
+++ b/modules/codec/avcodec/fourcc.c
@@ -144,8 +144,6 @@ static const struct
     { VLC_CODEC_TRUEMOTION1, CODEC_ID_TRUEMOTION1, VIDEO_ES },
     { VLC_CODEC_TRUEMOTION2, CODEC_ID_TRUEMOTION2, VIDEO_ES },
 
-    { VLC_CODEC_SNOW, CODEC_ID_SNOW, VIDEO_ES },
-
     { VLC_CODEC_QTRLE, CODEC_ID_QTRLE, VIDEO_ES },
 
     { VLC_CODEC_QDRAW, CODEC_ID_QDRAW, VIDEO_ES },

diff --git a/modules/mux/ogg.c b/modules/mux/ogg.c
index 8ace9262f642706cbd4258e1c01618a574eabfe3..85758a28bb1ded08bc403d553bcea8f5106b2287 100644 (file)
--- a/modules/mux/ogg.c
+++ b/modules/mux/ogg.c
@@ -309,7 +309,6 @@ static int AddStream( sout_mux_t *p_mux, sout_input_t *p_input )
         case VLC_CODEC_WMV1:
         case VLC_CODEC_WMV2:
         case VLC_CODEC_WMV3:
-        case VLC_CODEC_SNOW:
             p_stream->p_oggds_header = calloc( 1, sizeof(oggds_header_t) );
             if( !p_stream->p_oggds_header )
             {

diff --git a/src/misc/fourcc.c b/src/misc/fourcc.c
index ee6b48d078ec203d8a8cb30c6027191d6e521c67..1fa686e7d856e46191fffb6ff19b6074418157ce 100644 (file)
--- a/src/misc/fourcc.c
+++ b/src/misc/fourcc.c
@@ -618,11 +618,6 @@ static const staticentry_t p_list_video[] = {
     B(VLC_CODEC_TRUEMOTION2, "Duck TrueMotion v2.0 Video"),
         A("TM20"),
 
-    /* FFMPEG's SNOW wavelet codec */
-    B(VLC_CODEC_SNOW, "FFMpeg SNOW wavelet Video"),
-        A("SNOW"),
-        A("snow"),
-
     B(VLC_CODEC_QTRLE, "Apple QuickTime RLE Video"),
         A("rle "),