X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=96dda2b218fd774594c4c3707246c5ee684a8ba1;hb=9f7ca5995259a0a27842f8b308309941849b3571;hp=eb8670d6c2a446b555fa4a6e568e402588305a0a;hpb=60d706be7bd8d918b6cbb57649939aa1410a106b;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index eb8670d..96dda2b 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -70,15 +70,35 @@ else
 
 	if [ "$svn_ffmpeg" != "" ]
 	then
-		[ ! -d "ffmpeg" ] && ( 
+		if [ "$gpl" = "true" ]
+		then
+			enable_gpl="--enable-gpl"
+			if [ "$swscale" != "" ]
+			then
+					enable_swscale="--enable-swscaler"
+					echo "SWSCALE=1" >> config.mak
+			fi
+		elif [ "$swscale" != "" ]
+		then
+			echo
+			echo "ERROR        ERROR        ERROR        ERROR        ERROR        ERROR"
+			echo "--enable-gpl is required to use --avformat-swscale with --avformat-svn!"
+			echo
+			exit
+		fi
+		if [ ! -d "ffmpeg" ]
+		then
 			echo
 			echo "Checking out ffmpeg/avformat - no password required"
 			echo
 			svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
-		)
-		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared --build-suffix="$avformat_suffix" )
+		fi
+		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale )
 		#[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
-		echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil" >> config.mak
+		echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libswscale" >> config.mak
+		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libswscale" >> config.mak
+		[ $targetos = "Darwin" ] &&
+			echo "LDFLAGS+=-single_module" >> config.mak
 		echo "LOCAL_FFMPEG=1" >> config.mak
 		extra_libs="$extra_libs -lz"
 	elif [ "$static_ffmpeg" != "" ]