[Ffmpeg-cvslog] r7610 - in trunk/libavcodec: Makefile flashsv.c

[diego]

Author: diego
Date: Sun Jan 21 21:04:00 2007
New Revision: 7610

Modified:
   trunk/libavcodec/Makefile
   trunk/libavcodec/flashsv.c

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


Modified: trunk/libavcodec/Makefile
==============================================================================
--- trunk/libavcodec/Makefile	(original)
+++ trunk/libavcodec/Makefile	Sun Jan 21 21:04:00 2007
@@ -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 \

Modified: trunk/libavcodec/flashsv.c
==============================================================================
--- trunk/libavcodec/flashsv.c	(original)
+++ trunk/libavcodec/flashsv.c	Sun Jan 21 21:04:00 2007
@@ -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