From: ddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Tue, 27 Mar 2007 18:29:12 +0000 (+0000)
Subject: fixup some swscale integration
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=ca2cd08a27aef250b116f3ea2d3b6729f9713933;p=melted

fixup some swscale integration


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@957 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/ChangeLog b/ChangeLog
index a6b4abf..fdf050a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,9 @@
 $Id$
 
+2007-03-27 Dan Dennedy <dan@dennedy.org>
+	Fix ffmpeg swscale code enabled with mmx flags and fix --enable-swscale
+	in conjunction with --avformat-static.
+
 2007-03-16 Dan Dennedy <dan@dennedy.org>
 	Added docs/policies.txt.
 
diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index d9ee317..5dc00ba 100644
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -19,7 +19,7 @@ LDFLAGS+=-L../../framework
 
 LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
 
-ifdef MMX_FLAGS
+ifdef SWSCALE
 	CFLAGS+=-DSWSCALE
 	LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
 endif
diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 0d9986c..7467a20 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -89,7 +89,12 @@ else
 			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
 			[ $targetos = "Darwin" ] &&
 			 	echo "LDFLAGS+=-single_module" >> config.mak
-			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
+			if [ "$swscale" != "" ]
+			then
+				echo "CFLAGS+=-I$static_ffmpeg/libswscale" >> config.mak
+				echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
+				echo "SWSCALE=1" >> config.mak
+			fi
 		else
 			echo "avformat: Invalid path specified: $static_ffmpeg"
 			touch ../disable-avformat