diff options
| author | Diego Biurrun <diego@biurrun.de> | 2008-09-03 12:33:21 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2008-09-03 12:33:21 +0000 |
| commit | f544a5fc84975879746f619e01b6f1e80844e59e (patch) | |
| tree | 888967928796e772987ca8a3ad5834b7029beb27 /libavcodec/asv1.c | |
| parent | bb6c34e55b158c457272046ed9f22b974e832fb5 (diff) | |
Replace generic CONFIG_ENCODERS preprocessor conditionals by more specific
CONFIG_FOO_ENCODER conditionals where appropriate.
Originally committed as revision 15174 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/asv1.c')
| -rw-r--r-- | libavcodec/asv1.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/libavcodec/asv1.c b/libavcodec/asv1.c index f7ef68e343..8f16111960 100644 --- a/libavcodec/asv1.c +++ b/libavcodec/asv1.c @@ -465,7 +465,7 @@ for(i=0; i<s->avctx->extradata_size; i++){ return (get_bits_count(&a->gb)+31)/32*4; } -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ ASV1Context * const a = avctx->priv_data; AVFrame *pict = data; @@ -519,7 +519,7 @@ static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, return size*4; } -#endif /* CONFIG_ENCODERS */ +#endif /* defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) */ static av_cold void common_init(AVCodecContext *avctx){ ASV1Context * const a = avctx->priv_data; @@ -569,7 +569,7 @@ static av_cold int decode_init(AVCodecContext *avctx){ return 0; } -#ifdef CONFIG_ENCODERS +#if defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) static av_cold int encode_init(AVCodecContext *avctx){ ASV1Context * const a = avctx->priv_data; int i; @@ -593,7 +593,7 @@ static av_cold int encode_init(AVCodecContext *avctx){ return 0; } -#endif +#endif /* defined(CONFIG_ASV1_ENCODER) || defined(CONFIG_ASV2_ENCODER) */ static av_cold int decode_end(AVCodecContext *avctx){ ASV1Context * const a = avctx->priv_data; @@ -631,8 +631,7 @@ AVCodec asv2_decoder = { .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), }; -#ifdef CONFIG_ENCODERS - +#ifdef CONFIG_ASV1_ENCODER AVCodec asv1_encoder = { "asv1", CODEC_TYPE_VIDEO, @@ -644,7 +643,9 @@ AVCodec asv1_encoder = { .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("ASUS V1"), }; +#endif +#ifdef CONFIG_ASV2_ENCODER AVCodec asv2_encoder = { "asv2", CODEC_TYPE_VIDEO, @@ -656,5 +657,4 @@ AVCodec asv2_encoder = { .pix_fmts= (enum PixelFormat[]){PIX_FMT_YUV420P, PIX_FMT_NONE}, .long_name= NULL_IF_CONFIG_SMALL("ASUS V2"), }; - -#endif //CONFIG_ENCODERS +#endif |