diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-01-21 20:04:00 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-01-21 20:04:00 +0000 |
| commit | efbd19fe760edcd71adcf3b60fd23ec3ae259e83 (patch) | |
| tree | 543a535006bb3641b2e6b9ed7826c4ccf05dce7f /libavcodec | |
| parent | 60527f3163a3580826180c4083d6a40eb0c2f4bc (diff) | |
| download | ffmpeg-efbd19fe760edcd71adcf3b60fd23ec3ae259e83.tar.gz | |
Declare zlib dependency in the Makefile, not in the source.
Originally committed as revision 7610 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/Makefile | 6 | ||||
| -rw-r--r-- | libavcodec/flashsv.c | 2 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/Makefile b/libavcodec/Makefile index c1dec5848d..c3c7ea98e9 100644 --- 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 c2bbb3de23..9e4aa951ae 100644 --- 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 |