[MPlayer-cvslog] r34655 - in trunk: Makefile configure

[cigaes]

Author: cigaes
Date: Tue Feb  7 13:27:23 2012
New Revision: 34655

Log:
build: fix lavfi dependencies (swscale and swresample).

Modified:
   trunk/Makefile
   trunk/configure

Modified: trunk/Makefile
==============================================================================
--- trunk/Makefile	Mon Feb  6 07:30:12 2012	(r34654)
+++ trunk/Makefile	Tue Feb  7 13:27:23 2012	(r34655)
@@ -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)))
 

Modified: trunk/configure
==============================================================================
--- trunk/configure	Mon Feb  6 07:30:12 2012	(r34654)
+++ trunk/configure	Tue Feb  7 13:27:23 2012	(r34655)
@@ -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