X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=71cf4ced854d37d6f691e81cc52034b7aab4490f;hb=b917ae819659606f59b3ae761d06ab2095ade658;hp=11ad231235367b0a09227193616f9b806aee5ecd;hpb=9b304e5ac1fbab3425088a96c72a652e39a0a260;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 11ad231..71cf4ce 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -5,6 +5,7 @@ then
 	cat << EOF
 FFMPEG/avformat options:
 
+  --avformat-cvs          - Obtain ffmpeg from CVS
   --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
@@ -17,6 +18,7 @@ else
 	export static_ffmpeg=
 	export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
 	export extra_libs=
+	export cvs_ffmpeg=
 
 	if [ "$shared_ffmpeg" != "" ]
 	then
@@ -32,10 +34,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 ;;
 		esac
 	done
 
-	if [ "$static_ffmpeg" != "" ]
+	if [ "$cvs_ffmpeg" != "" ]
+	then
+		[ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "8/5/2004 15:30 CET" ffmpeg
+		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure )
+		#[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
+		echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec" >> config.mak
+		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec" >> config.mak
+		echo "LOCAL_FFMPEG=1" >> config.mak
+		extra_libs="$extra_libs -lz"
+	elif [ "$static_ffmpeg" != "" ]
 	then 
 		if [ -d "$static_ffmpeg" ]
 		then
@@ -52,7 +64,8 @@ else
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
 			echo "LDFLAGS+=-L$shared_ffmpeg" >> config.mak
 		else
-			echo "avformat: No build environment found."
+			echo "avformat: No build environment found. "
+			echo "          Try configuring mlt with --avformat-cvs."
 			touch ../disable-avformat
 			exit 0
 		fi
@@ -67,6 +80,7 @@ EOF
 cat << EOF >> ../filters.dat
 avdeinterlace	libmltavformat.so
 avresample		libmltavformat.so
+avcolour_space	libmltavformat.so
 EOF
 
 cat << EOF >> ../consumers.dat