diff options
author | Måns Rullgård <mans@mansr.com> | 2007-07-16 21:05:16 +0000 |
---|---|---|
committer | Måns Rullgård <mans@mansr.com> | 2007-07-16 21:05:16 +0000 |
commit | 19b95df09ec3ca56b00104e68def64b8b29560b0 (patch) | |
tree | 598668b3a515caf311641c48c816ed9cfc92baad /libavcodec | |
parent | 1fc44ed69e009553a5fb2c703f0d60a81d2755ed (diff) | |
download | ffmpeg-19b95df09ec3ca56b00104e68def64b8b29560b0.tar.gz |
remove useless #ifdef CONFIG_ZLIB from zmbv decoder
Originally committed as revision 9708 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
-rw-r--r-- | libavcodec/zmbv.c | 28 |
1 files changed, 3 insertions, 25 deletions
diff --git a/libavcodec/zmbv.c b/libavcodec/zmbv.c index f7448ef7a8..76d8b654a3 100644 --- a/libavcodec/zmbv.c +++ b/libavcodec/zmbv.c @@ -29,9 +29,7 @@ #include "avcodec.h" -#ifdef CONFIG_ZLIB #include <zlib.h> -#endif #define ZMBV_KEYFRAME 1 #define ZMBV_DELTAPAL 2 @@ -66,9 +64,7 @@ typedef struct ZmbvContext { int flags; int bw, bh, bx, by; int decomp_len; -#ifdef CONFIG_ZLIB z_stream zstream; -#endif int (*decode_intra)(struct ZmbvContext *c); int (*decode_xor)(struct ZmbvContext *c); } ZmbvContext; @@ -399,9 +395,7 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 { ZmbvContext * const c = avctx->priv_data; uint8_t *outptr; -#ifdef CONFIG_ZLIB int zret = Z_OK; // Zlib return code -#endif int len = buf_size; int hi_ver, lo_ver; @@ -473,16 +467,13 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 av_log(avctx, AV_LOG_ERROR, "Unsupported (for now) format %i\n", c->fmt); return -1; } -#ifdef CONFIG_ZLIB + zret = inflateReset(&c->zstream); if (zret != Z_OK) { av_log(avctx, AV_LOG_ERROR, "Inflate reset error: %d\n", zret); return -1; } -#else - av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n"); - return -1; -#endif /* CONFIG_ZLIB */ + c->cur = av_realloc(c->cur, avctx->width * avctx->height * (c->bpp / 8)); c->prev = av_realloc(c->prev, avctx->width * avctx->height * (c->bpp / 8)); c->bx = (c->width + c->bw - 1) / c->bw; @@ -498,7 +489,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 memcpy(c->decomp_buf, buf, len); c->decomp_size = 1; } else { // ZLIB-compressed data -#ifdef CONFIG_ZLIB c->zstream.total_in = c->zstream.total_out = 0; c->zstream.next_in = buf; c->zstream.avail_in = len; @@ -506,10 +496,6 @@ static int decode_frame(AVCodecContext *avctx, void *data, int *data_size, uint8 c->zstream.avail_out = c->decomp_size; inflate(&c->zstream, Z_FINISH); c->decomp_len = c->zstream.total_out; -#else - av_log(avctx, AV_LOG_ERROR, "BUG! Zlib support not compiled in frame decoder.\n"); - return -1; -#endif } if(c->flags & ZMBV_KEYFRAME) { c->pic.key_frame = 1; @@ -618,13 +604,9 @@ static int decode_init(AVCodecContext *avctx) } c->bpp = avctx->bits_per_sample; -#ifdef CONFIG_ZLIB // Needed if zlib unused or init aborted before inflateInit memset(&(c->zstream), 0, sizeof(z_stream)); -#else - av_log(avctx, AV_LOG_ERROR, "Zlib support not compiled.\n"); - return 1; -#endif + avctx->pix_fmt = PIX_FMT_RGB24; c->decomp_size = (avctx->width + 255) * 4 * (avctx->height + 64); @@ -636,7 +618,6 @@ static int decode_init(AVCodecContext *avctx) } } -#ifdef CONFIG_ZLIB c->zstream.zalloc = Z_NULL; c->zstream.zfree = Z_NULL; c->zstream.opaque = Z_NULL; @@ -645,7 +626,6 @@ static int decode_init(AVCodecContext *avctx) av_log(avctx, AV_LOG_ERROR, "Inflate init error: %d\n", zret); return 1; } -#endif return 0; } @@ -665,9 +645,7 @@ static int decode_end(AVCodecContext *avctx) if (c->pic.data[0]) avctx->release_buffer(avctx, &c->pic); -#ifdef CONFIG_ZLIB inflateEnd(&(c->zstream)); -#endif av_freep(&c->cur); av_freep(&c->prev); |