Mercurial > libavcodec.hg
diff huffyuv.c @ 7776:dbcdd0165e55 libavcodec
Replace generic CONFIG_DECODERS preprocessor conditionals by more specific
CONFIG_FOO_DECODER conditionals where appropriate.
author | diego |
---|---|
date | Tue, 02 Sep 2008 23:25:57 +0000 |
parents | e943e1409077 |
children | 6efb15a24e91 |
line wrap: on
line diff
--- a/huffyuv.c Tue Sep 02 23:14:11 2008 +0000 +++ b/huffyuv.c Tue Sep 02 23:25:57 2008 +0000 @@ -477,7 +477,7 @@ return 0; } -#ifdef CONFIG_DECODERS +#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) static av_cold int decode_init(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; @@ -573,7 +573,7 @@ return 0; } -#endif +#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ #ifdef CONFIG_ENCODERS static int store_table(HYuvContext *s, uint8_t *len, uint8_t *buf){ @@ -931,7 +931,7 @@ return 0; } -#ifdef CONFIG_DECODERS +#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) static void draw_slice(HYuvContext *s, int y){ int h, cy; int offset[4]; @@ -1198,7 +1198,7 @@ return (get_bits_count(&s->gb)+31)/32*4 + table_size; } -#endif +#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ static int common_end(HYuvContext *s){ int i; @@ -1209,7 +1209,7 @@ return 0; } -#ifdef CONFIG_DECODERS +#if defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) static av_cold int decode_end(AVCodecContext *avctx) { HYuvContext *s = avctx->priv_data; @@ -1224,7 +1224,7 @@ return 0; } -#endif +#endif /* defined(CONFIG_HUFFYUV_DECODER) || defined(CONFIG_FFVHUFF_DECODER) */ #ifdef CONFIG_ENCODERS static int encode_frame(AVCodecContext *avctx, unsigned char *buf, int buf_size, void *data){ @@ -1433,7 +1433,7 @@ } #endif /* CONFIG_ENCODERS */ -#ifdef CONFIG_DECODERS +#ifdef CONFIG_HUFFYUV_DECODER AVCodec huffyuv_decoder = { "huffyuv", CODEC_TYPE_VIDEO, @@ -1447,7 +1447,9 @@ NULL, .long_name = NULL_IF_CONFIG_SMALL("Huffyuv / HuffYUV"), }; +#endif +#ifdef CONFIG_FFVHUFF_DECODER AVCodec ffvhuff_decoder = { "ffvhuff", CODEC_TYPE_VIDEO,