changeset 4373:a4ccf06dfae2 libavcodec

Declare zlib dependency in the Makefile, not in the source.
author diego
date Sun, 21 Jan 2007 20:04:00 +0000
parents 9abacee8d312
children 65bb4ce33467
files Makefile flashsv.c
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/Makefile	Sun Jan 21 18:46:19 2007 +0000
+++ b/Makefile	Sun Jan 21 20:04:00 2007 +0000
@@ -77,7 +77,6 @@
 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_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 \
--- a/flashsv.c	Sun Jan 21 18:46:19 2007 +0000
+++ b/flashsv.c	Sun Jan 21 20:04:00 2007 +0000
@@ -54,7 +54,6 @@
 #include "avcodec.h"
 #include "bitstream.h"
 
-#ifdef CONFIG_ZLIB
 #include <zlib.h>
 
 typedef struct FlashSVContext {
@@ -259,4 +258,3 @@
     CODEC_CAP_DR1,
     .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1},
 };
-#endif //CONFIG_ZLIB