[MPlayer-dev-eng] [PATCH] build: fix lavfi dependencies (swscale and swresample).

[Nicolas George]

---
 Makefile  |    3 ++-
 configure |    1 +
 2 files changed, 3 insertions(+), 1 deletions(-)


Note: it only takes care of the internal version. As far as I know, using
libavfilter with external ffmpeg was not supported anyway.

Clément: I believe your patch has unnecessary bits: when linking against
external libavfilter (if supported), libswresample (and libswscale) should
come automatically either through pkg-config or the dependencies of the
shared object files. That only leaves the case of statically linked external
libavfilter without pkg-config: we can live with that.

Regards,

-- 
  Nicolas George


diff --git a/Makefile b/Makefile
index 8e80b9e..17a1189 100644
--- a/Makefile
+++ b/Makefile
@@ -689,7 +689,8 @@ SRCS_MENCODER = mencoder.c \
                 $(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 --git a/configure b/configure
index 00e2fd7..0decbd5 100755
--- a/configure
+++ b/configure
@@ -8160,6 +8160,7 @@ CONFIG_AVFORMAT = $ffmpeg_a
 CONFIG_AVUTIL   = $ffmpeg_a
 CONFIG_POSTPROC = $ffmpeg_a
 CONFIG_SWSCALE  = $ffmpeg_a
+CONFIG_SWRESAMPLE = $ffmpeg_a
 
 ASFLAGS    = \$(CFLAGS)
 AS_DEPFLAGS= $DEPFLAGS
-- 
1.7.8.3