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 a6b4abf1703d8ea60f8cb181ffc4d3b338ae53ce..fdf050ae7b63edaac75f3c9c966ea2e005356b1a 100644 (file)
--- 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 d9ee317879eb0d60ca978e863c2f22aea5d95718..5dc00badd2e49a0d68c4667a685bc386d7078645 100644 (file)
--- 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 0d9986cfe8d949ac38d960d2639cc890475eaa1e..7467a20b8261fa6bd75b97bf19aaaf684ac4dfc7 100755 (executable)
--- 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