[SCM] libav/experimental: Declare zlib dependency in the Makefile, not in the source.
siretart at users.alioth.debian.org
siretart at users.alioth.debian.org
Sun Jun 30 15:55:15 UTC 2013
The following commit has been merged in the experimental branch:
commit efbd19fe760edcd71adcf3b60fd23ec3ae259e83
Author: Diego Biurrun <diego at biurrun.de>
Date: Sun Jan 21 20:04:00 2007 +0000
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 c1dec58..c3c7ea9 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 c2bbb3d..9e4aa95 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
--
Libav/FFmpeg packaging
More information about the pkg-multimedia-commits
mailing list