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:
parent
60527f3163
commit
efbd19fe76
2 changed files with 5 additions and 3 deletions
|
|
@ -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 \
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue