Declare zlib dependency in the Makefile, not in the source.

Originally committed as revision 7610 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/Makefile b/libavcodec/Makefile
index c1dec5848d20391180b1470f42ce7c037df365ec..c3c7ea98e9dfdba691e7eb6a7f36ccd8fbb9ad1b 100644 (file)
--- a/libavcodec/Makefile
+++ b/libavcodec/Makefile
@@ -77,7 +77,6 @@ OBJS-$(CONFIG_FFVHUFF_DECODER)         += huffyuv.o
 OBJS-$(CONFIG_FFVHUFF_ENCODER)         += huffyuv.o
 OBJS-$(CONFIG_FLAC_DECODER)            += flac.o
 OBJS-$(CONFIG_FLAC_ENCODER)            += flacenc.o
-OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
 OBJS-$(CONFIG_FLIC_DECODER)            += flicvideo.o
 OBJS-$(CONFIG_FOURXM_DECODER)          += 4xm.o
 OBJS-$(CONFIG_FRAPS_DECODER)           += fraps.o
@@ -243,6 +242,11 @@ OBJS-$(CONFIG_ADPCM_XA_ENCODER)        += adpcm.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_DECODER)    += adpcm.o
 OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER)    += adpcm.o
 
+# external dependencies
+ifeq ($(CONFIG_ZLIB),yes)
+OBJS-$(CONFIG_FLASHSV_DECODER)         += flashsv.o
+endif
+
 # external codec libraries
 OBJS-$(CONFIG_LIBA52)                  += a52dec.o
 OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN)  += liba52/bit_allocate.o \

diff --git a/libavcodec/flashsv.c b/libavcodec/flashsv.c
index c2bbb3de236873df2bac862c60eb3611e79ead82..9e4aa951aecd5643039c8671e392e8cc1d778909 100644 (file)
--- a/libavcodec/flashsv.c
+++ b/libavcodec/flashsv.c
@@ -54,7 +54,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 
-#ifdef CONFIG_ZLIB
 #include <zlib.h>
 
 typedef struct FlashSVContext {
@@ -259,4 +258,3 @@ AVCodec flashsv_decoder = {
     CODEC_CAP_DR1,
     .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1},
 };
-#endif //CONFIG_ZLIB