Mercurial > mplayer.hg

changeset 34567:2c9db9cb7310

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
build: fix lavfi dependencies (swscale and swresample).
author cigaes
date Tue, 07 Feb 2012 12:27:23 +0000
parents f3d53cd55376
children ad22be82d79a
files Makefile configure
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- 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)))
 
--- 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