[vlc-commits] Drop aborted SNOW codec

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Fri Mar  8 18:36:57 2013 +0200| [1e15960097cf0661acd30b64f5f2c5eb7258b07f] | committer: Rémi Denis-Courmont

Drop aborted SNOW codec

This is not supported in libavcodec anymore.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1e15960097cf0661acd30b64f5f2c5eb7258b07f
---

 include/vlc_fourcc.h           |    1 -
 modules/codec/avcodec/fourcc.c |    2 --
 modules/mux/ogg.c              |    1 -
 src/misc/fourcc.c              |    5 -----
 4 files changed, 9 deletions(-)

diff --git a/include/vlc_fourcc.h b/include/vlc_fourcc.h
index 9fc887a..65fe60a 100644
--- 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 db75860..25c9f17 100644
--- 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 8ace926..85758a2 100644
--- 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 ee6b48d..1fa686e 100644
--- 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 "),