Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.942
diff -u -r1.942 configure
--- configure	25 Nov 2004 21:47:58 -0000	1.942
+++ configure	5 Dec 2004 09:26:58 -0000
@@ -6964,8 +6964,9 @@
 /* Use libavcodec's decoders */
 #define CONFIG_DECODERS 1
 /* Use libavcodec's encoders */
+#ifdef HAVE_MENCODER
 #define CONFIG_ENCODERS 1
-
+#endif
 #define CONFIG_MPEGAUDIO_HP 1
 
 /* Use codec libs included in mplayer CVS / source dist: */
Index: libavcodec/h261.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/h261.c,v
retrieving revision 1.21
diff -u -r1.21 h261.c
--- libavcodec/h261.c	27 Nov 2004 18:10:05 -0000	1.21
+++ libavcodec/h261.c	5 Dec 2004 09:27:01 -0000
@@ -1012,7 +1012,7 @@
     MPV_common_end(s);
     return 0;
 }
-
+#ifdef CONFIG_ENCODERS
 AVCodec h261_encoder = {
     "h261",
     CODEC_TYPE_VIDEO,
@@ -1022,7 +1022,7 @@
     MPV_encode_picture,
     MPV_encode_end,
 };
-
+#endif
 AVCodec h261_decoder = {
     "h261",
     CODEC_TYPE_VIDEO,
Index: libavcodec/snow.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/snow.c,v
retrieving revision 1.37
diff -u -r1.37 snow.c
--- libavcodec/snow.c	25 Nov 2004 19:26:46 -0000	1.37
+++ libavcodec/snow.c	5 Dec 2004 09:27:02 -0000
@@ -2611,7 +2611,7 @@
         }
     }
 }
-
+#ifdef CONFIG_ENCODERS
 static int encode_init(AVCodecContext *avctx)
 {
     SnowContext *s = avctx->priv_data;
@@ -2660,7 +2660,7 @@
     s->chroma_v_shift= 1;
     return 0;
 }
-
+#endif
 static int frame_start(SnowContext *s){
    AVFrame tmp;
    int w= s->avctx->width; //FIXME round up to x16 ?
@@ -3004,7 +3004,7 @@
     0 /*CODEC_CAP_DR1*/ /*| CODEC_CAP_DRAW_HORIZ_BAND*/,
     NULL
 };
-
+#ifdef CONFIG_ENCODERS
 AVCodec snow_encoder = {
     "snow",
     CODEC_TYPE_VIDEO,
@@ -3014,7 +3014,7 @@
     encode_frame,
     encode_end,
 };
-
+#endif
 
 #if 0
 #undef malloc