RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Originally committed as revision 7610 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Diego Biurrun 2007-01-21 20:04:00 +00:00
parent 60527f3163
commit efbd19fe76
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libavcodec/Makefile
View File

@ -77,7 +77,6 @@ OBJS-$(CONFIG_FFVHUFF_DECODER) += huffyuv.o
OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o OBJS-$(CONFIG_FFVHUFF_ENCODER) += huffyuv.o
OBJS-$(CONFIG_FLAC_DECODER) += flac.o OBJS-$(CONFIG_FLAC_DECODER) += flac.o
OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o OBJS-$(CONFIG_FLAC_ENCODER) += flacenc.o
OBJS-$(CONFIG_FLASHSV_DECODER) += flashsv.o
OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o OBJS-$(CONFIG_FLIC_DECODER) += flicvideo.o
OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o OBJS-$(CONFIG_FOURXM_DECODER) += 4xm.o
OBJS-$(CONFIG_FRAPS_DECODER) += fraps.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_DECODER) += adpcm.o
OBJS-$(CONFIG_ADPCM_YAMAHA_ENCODER) += 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 # external codec libraries
OBJS-$(CONFIG_LIBA52) += a52dec.o OBJS-$(CONFIG_LIBA52) += a52dec.o
OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN) += liba52/bit_allocate.o \ OBJS-$(CONFIG_LIBA52)$(CONFIG_LIBA52BIN) += liba52/bit_allocate.o \

2
libavcodec/flashsv.c
View File

@ -54,7 +54,6 @@
#include "avcodec.h" #include "avcodec.h"
#include "bitstream.h" #include "bitstream.h"
#ifdef CONFIG_ZLIB
#include <zlib.h> #include <zlib.h>
typedef struct FlashSVContext { typedef struct FlashSVContext {
@ -259,4 +258,3 @@ AVCodec flashsv_decoder = {
CODEC_CAP_DR1, CODEC_CAP_DR1,
.pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1}, .pix_fmts = (enum PixelFormat[]){PIX_FMT_BGR24, -1},
}; };
#endif //CONFIG_ZLIB