# HG changeset patch # User cigaes # Date 1328617643 0 # Node ID 2c9db9cb7310d717d531a1089e5488a2e2c917cb # Parent f3d53cd553760183895519231016a4045664c62c build: fix lavfi dependencies (swscale and swresample). diff -r f3d53cd55376 -r 2c9db9cb7310 Makefile --- a/Makefile Mon Feb 06 06:30:12 2012 +0000 +++ b/Makefile Tue Feb 07 12:27:23 2012 +0000 @@ -689,7 +689,8 @@ $(SRCS_MENCODER-yes) # (linking) order matters for these libraries -FFMPEGPARTS = libpostproc libswscale libavfilter libavformat libavcodec libavutil +FFMPEGPARTS_ALL = libpostproc libavfilter libavformat libavcodec libswscale libswresample libavutil +FFMPEGPARTS = $(foreach part, $(FFMPEGPARTS_ALL), $(if $(wildcard ffmpeg/$(part)), $(part))) FFMPEGLIBS = $(foreach part, $(FFMPEGPARTS), ffmpeg/$(part)/$(part).a) FFMPEGFILES = $(foreach part, $(FFMPEGPARTS), $(wildcard $(addprefix ffmpeg/$(part)/,*.[chS] /*/*.[chS] /*/*.asm))) diff -r f3d53cd55376 -r 2c9db9cb7310 configure --- a/configure Mon Feb 06 06:30:12 2012 +0000 +++ b/configure Tue Feb 07 12:27:23 2012 +0000 @@ -8160,6 +8160,7 @@ CONFIG_AVUTIL = $ffmpeg_a CONFIG_POSTPROC = $ffmpeg_a CONFIG_SWSCALE = $ffmpeg_a +CONFIG_SWRESAMPLE = $ffmpeg_a ASFLAGS = \$(CFLAGS) AS_DEPFLAGS= $DEPFLAGS