# HG changeset patch # User diego # Date 1220445798 0 # Node ID e3f2d90a229596d5417620f8100d4f52362a7894 # Parent 12a25666f1e4f1fcf73a5b4252e2a3df5153d811 Disable encoders by undefining CONFIG_FOO_ENCODER once instead of littering the code with preprocessor directives. diff -r 12a25666f1e4 -r e3f2d90a2295 cljr.c --- a/cljr.c Wed Sep 03 12:35:17 2008 +0000 +++ b/cljr.c Wed Sep 03 12:43:18 2008 +0000 @@ -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 @@ 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 @@ return size*4; } #endif -#endif static av_cold void common_init(AVCodecContext *avctx){ CLJRContext * const a = avctx->priv_data; @@ -123,7 +124,6 @@ return 0; } -#if 0 #ifdef CONFIG_CLJR_ENCODER static av_cold int encode_init(AVCodecContext *avctx){ @@ -132,7 +132,6 @@ return 0; } #endif -#endif AVCodec cljr_decoder = { "cljr", @@ -146,7 +145,7 @@ 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 @@ .long_name = NULL_IF_CONFIG_SMALL("Cirrus Logic AccuPak"), }; #endif -#endif diff -r 12a25666f1e4 -r e3f2d90a2295 vcr1.c --- a/vcr1.c Wed Sep 03 12:35:17 2008 +0000 +++ b/vcr1.c Wed Sep 03 12:43:18 2008 +0000 @@ -30,6 +30,9 @@ //#undef NDEBUG //#include +/* Disable the encoder. */ +#undef CONFIG_VCR1_ENCODER + typedef struct VCR1Context{ AVCodecContext *avctx; AVFrame picture; @@ -113,7 +116,6 @@ 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 @@ return size*4; } #endif -#endif static av_cold void common_init(AVCodecContext *avctx){ VCR1Context * const a = avctx->priv_data; @@ -155,7 +156,6 @@ return 0; } -#if 0 #ifdef CONFIG_VCR1_ENCODER static av_cold int encode_init(AVCodecContext *avctx){ @@ -164,7 +164,6 @@ return 0; } #endif -#endif AVCodec vcr1_decoder = { "vcr1", @@ -178,7 +177,7 @@ 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 @@ .long_name = NULL_IF_CONFIG_SMALL("ATI VCR1"), }; #endif -#endif