[SCM] libav/experimental: Disable encoders by undefining CONFIG_FOO_ENCODER once instead of littering the code with preprocessor directives.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit c7ac9449bad31d16dbb34d09218584b082c3be65
Author: Diego Biurrun <diego at biurrun.de>
Date:   Wed Sep 3 12:43:18 2008 +0000

    Disable encoders by undefining CONFIG_FOO_ENCODER once instead of littering
    the code with preprocessor directives.
    
    Originally committed as revision 15176 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/cljr.c b/libavcodec/cljr.c
index 21a3e50..c80af01 100644
--- a/libavcodec/cljr.c
+++ b/libavcodec/cljr.c
@@ -28,6 +28,9 @@
 #include "dsputil.h"
 #include "bitstream.h"
 
+/* Disable the encoder. */
+#undef CONFIG_CLJR_ENCODER
+
 typedef struct CLJRContext{
     AVCodecContext *avctx;
     AVFrame picture;
@@ -81,7 +84,6 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-#if 0
 #ifdef CONFIG_CLJR_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     CLJRContext * const a = avctx->priv_data;
@@ -105,7 +107,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     return size*4;
 }
 #endif
-#endif
 
 static av_cold void common_init(AVCodecContext *avctx){
     CLJRContext * const a = avctx->priv_data;
@@ -123,7 +124,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0
 #ifdef CONFIG_CLJR_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx){
 
@@ -132,7 +132,6 @@ static av_cold int encode_init(AVCodecContext *avctx){
     return 0;
 }
 #endif
-#endif
 
 AVCodec cljr_decoder = {
     "cljr",
@@ -146,7 +145,7 @@ AVCodec cljr_decoder = {
     CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
-#if 0
+
 #ifdef CONFIG_CLJR_ENCODER
 AVCodec cljr_encoder = {
     "cljr",
@@ -159,4 +158,3 @@ AVCodec cljr_encoder = {
     .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"),
 };
 #endif
-#endif
diff --git a/libavcodec/vcr1.c b/libavcodec/vcr1.c
index 3c6cee5..d9d4ce9 100644
--- a/libavcodec/vcr1.c
+++ b/libavcodec/vcr1.c
@@ -30,6 +30,9 @@
 //#undef NDEBUG
 //#include <assert.h>
 
+/* Disable the encoder. */
+#undef CONFIG_VCR1_ENCODER
+
 typedef struct VCR1Context{
     AVCodecContext *avctx;
     AVFrame picture;
@@ -113,7 +116,6 @@ static int decode_frame(AVCodecContext *avctx,
     return buf_size;
 }
 
-#if 0
 #ifdef CONFIG_VCR1_ENCODER
 static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){
     VCR1Context * const a = avctx->priv_data;
@@ -137,7 +139,6 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size,
     return size*4;
 }
 #endif
-#endif
 
 static av_cold void common_init(AVCodecContext *avctx){
     VCR1Context * const a = avctx->priv_data;
@@ -155,7 +156,6 @@ static av_cold int decode_init(AVCodecContext *avctx){
     return 0;
 }
 
-#if 0
 #ifdef CONFIG_VCR1_ENCODER
 static av_cold int encode_init(AVCodecContext *avctx){
 
@@ -164,7 +164,6 @@ static av_cold int encode_init(AVCodecContext *avctx){
     return 0;
 }
 #endif
-#endif
 
 AVCodec vcr1_decoder = {
     "vcr1",
@@ -178,7 +177,7 @@ AVCodec vcr1_decoder = {
     CODEC_CAP_DR1,
     .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
-#if 0
+
 #ifdef CONFIG_VCR1_ENCODER
 AVCodec vcr1_encoder = {
     "vcr1",
@@ -191,4 +190,3 @@ AVCodec vcr1_encoder = {
     .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"),
 };
 #endif
-#endif

-- 
Libav/FFmpeg packaging