# HG changeset patch # User banan # Date 1169382383 0 # Node ID b885917fbfef83571e3f56c74eafa7e0545772a4 # Parent f8753597422c7ae5a3cb40c23b4ce7029b6c0626 Get rid of #ifdef CONFIG_ZLIB in the code. Code cleanup. diff -r f8753597422c -r b885917fbfef allcodecs.c --- a/allcodecs.c Sun Jan 21 09:55:28 2007 +0000 +++ b/allcodecs.c Sun Jan 21 12:26:23 2007 +0000 @@ -65,7 +65,9 @@ REGISTER_DECODER(EIGHTBPS, eightbps); REGISTER_ENCDEC (FFV1, ffv1); REGISTER_ENCDEC (FFVHUFF, ffvhuff); +#ifdef CONFIG_ZLIB REGISTER_DECODER(FLASHSV, flashsv); +#endif REGISTER_DECODER(FLIC, flic); REGISTER_ENCDEC (FLV, flv); REGISTER_DECODER(FOURXM, fourxm); diff -r f8753597422c -r b885917fbfef flashsv.c --- a/flashsv.c Sun Jan 21 09:55:28 2007 +0000 +++ b/flashsv.c Sun Jan 21 12:26:23 2007 +0000 @@ -49,15 +49,12 @@ #include #include +#include #include "common.h" #include "avcodec.h" #include "bitstream.h" -#ifdef CONFIG_ZLIB -#include -#endif - typedef struct FlashSVContext { AVCodecContext *avctx; AVFrame frame; @@ -65,9 +62,7 @@ int block_width, block_height; uint8_t* tmpblock; int block_size; -#ifdef CONFIG_ZLIB z_stream zstream; -#endif } FlashSVContext; @@ -90,7 +85,6 @@ int zret; // Zlib return code s->avctx = avctx; -#ifdef CONFIG_ZLIB s->zstream.zalloc = Z_NULL; s->zstream.zfree = Z_NULL; s->zstream.opaque = Z_NULL; @@ -99,10 +93,6 @@ av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return 1; } -#else - av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled. Needed for the decoder.\n"); - return 1; -#endif avctx->pix_fmt = PIX_FMT_BGR24; avctx->has_b_frames = 0; s->frame.data[0] = NULL; @@ -198,7 +188,6 @@ /* no change, don't do anything */ } else { /* decompress block */ -#ifdef CONFIG_ZLIB int ret = inflateReset(&(s->zstream)); if (ret != Z_OK) { @@ -222,10 +211,6 @@ av_log(avctx, AV_LOG_ERROR, "error in decompression of block %dx%d: %d\n", i, j, ret); /* return -1; */ } -#else - av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled in.\n"); - return -1; -#endif copy_region(s->tmpblock, s->frame.data[0], s->image_height-(hp+hs+1), wp, hs, ws, s->frame.linesize[0]); skip_bits(&gb, 8*size); /* skip the consumed bits */ } @@ -247,9 +232,7 @@ static int flashsv_decode_end(AVCodecContext *avctx) { FlashSVContext *s = (FlashSVContext *)avctx->priv_data; -#ifdef CONFIG_ZLIB inflateEnd(&(s->zstream)); -#endif /* release the frame if needed */ if (s->frame.data[0]) avctx->release_buffer(avctx, &s->frame);