summaryrefslogtreecommitdiff
path: root/libavcodec/flashsv.c
diff options
context:
space:
mode:
authorBenjamin Larsson <banan@ludd.ltu.se>2007-01-21 12:26:23 +0000
committerBenjamin Larsson <banan@ludd.ltu.se>2007-01-21 12:26:23 +0000
commit96dbe78f751f4b7c3f8324c590d5e8158e597ac0 (patch)
treea41cf1e73a3a3d91c273b61cde2214f8ef313977 /libavcodec/flashsv.c
parent6c77805fc84a63b74e5025b4d7eeea24c8138cf3 (diff)
Get rid of #ifdef CONFIG_ZLIB in the code. Code cleanup.
Originally committed as revision 7597 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/flashsv.c')
-rw-r--r--libavcodec/flashsv.c19
1 files changed, 1 insertions, 18 deletions
diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index fea8e2224c..4f99856006 100644
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -49,15 +49,12 @@
#include <stdio.h>
#include <stdlib.h>
+#include <zlib.h>
#include "common.h"
#include "avcodec.h"
#include "bitstream.h"
-#ifdef CONFIG_ZLIB
-#include <zlib.h>
-#endif
-
typedef struct FlashSVContext {
AVCodecContext *avctx;
AVFrame frame;
@@ -65,9 +62,7 @@ typedef struct FlashSVContext {
int block_width, block_height;
uint8_t* tmpblock;
int block_size;
-#ifdef CONFIG_ZLIB
z_stream zstream;
-#endif
} FlashSVContext;
@@ -90,7 +85,6 @@ static int flashsv_decode_init(AVCodecContext *avctx)
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 @@ static int flashsv_decode_init(AVCodecContext *avctx)
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 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
/* 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 @@ static int flashsv_decode_frame(AVCodecContext *avctx,
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_frame(AVCodecContext *avctx,
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);