X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=0d9986cfe8d949ac38d960d2639cc890475eaa1e;hb=cef70011d08af33924ab3b97d628deefce47b953;hp=f6175794e3774ebcef2d6dfc11442db03b144883;hpb=01fc881c8eeec166ed062f75edcde55dfba81b19;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index f617579..0d9986c 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -6,11 +6,12 @@ then
 	cat << EOF
 FFMPEG/avformat options:
 
-  --avformat-cvs          - Obtain ffmpeg from CVS
+  --avformat-svn          - Obtain ffmpeg from Subversion
   --avformat-shared=path  - Link against a shared installation of ffmpeg (default)
   --avformat-static=path  - Link against a static ffmpeg dev tree
   --avformat-ldextra=libs - Provide additional libs to link with
   --avformat-suffix=suff  - Specify a custom suffix for an ffmpeg shared build
+  --avformat-swscale      - Use ffmpeg libswcale instead of img_convert
 
 EOF
 
@@ -42,10 +43,11 @@ else
 	export static_ffmpeg=
 	export shared_ffmpeg=`which ffmpeg`
 	export extra_libs=
-	export cvs_ffmpeg=
+	export svn_ffmpeg=
 	export avformat_suffix=
+	export swscale=false
 
-	if [ "$shared_ffmpeg" != "" ]
+	if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
 	then
 		# Chop ffmpeg 
 		shared_ffmpeg=`dirname $shared_ffmpeg`
@@ -59,19 +61,20 @@ else
 			--avformat-static=* )	static_ffmpeg="${i#--avformat-static=}" ;;
 			--avformat-shared=* )	shared_ffmpeg="${i#--avformat-shared=}" ;;
 			--avformat-ldextra=* )	extra_libs="${i#--avformat-ldextra=}" ;;
-			--avformat-cvs )		cvs_ffmpeg=true ;;
+			--avformat-svn )		svn_ffmpeg=true ;;
+			--avformat-cvs )		svn_ffmpeg=true ;;
 			--avformat-suffix=* )	avformat_suffix="${i#--avformat-suffix=}" ;;
+			--avformat-swscale )	swscale=true ;;
 		esac
 	done
 
-	if [ "$cvs_ffmpeg" != "" ]
+	if [ "$svn_ffmpeg" != "" ]
 	then
 		[ ! -d "ffmpeg" ] && ( 
 			echo
 			echo "Checking out ffmpeg/avformat - no password required"
 			echo
-			cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg login
-			cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
+			svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
 		)
 		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared --build-suffix="$avformat_suffix" )
 		#[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
@@ -86,19 +89,21 @@ 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
 		else
 			echo "avformat: Invalid path specified: $static_ffmpeg"
 			touch ../disable-avformat
 			echo 0
 		fi
 	else 
-		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$LIBSUF" ]
+		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
 		then
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
 			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
+			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
 		else
 			echo "avformat: No build environment found. "
-			echo "          Try configuring mlt with --avformat-cvs."
+			echo "          Try configuring mlt with --avformat-svn."
 			touch ../disable-avformat
 			exit 0
 		fi