X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=e60ff280a0299d4aa49503ceb8057a94f9c3f977;hb=421997fe7b5ef0735d706c3976ef90fa5b65bd99;hp=cf7388b86d290654250cd6145ecd1d04d075004b;hpb=d4457eefde2e74e4dd5d927f37a89ed52e4b4cf9;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index cf7388b..e60ff28 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -40,9 +40,9 @@ else
 
 	if [ "$cvs_ffmpeg" != "" ]
 	then
-		[ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "6/7/2004 17:00 CET" ffmpeg
+		[ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "10/11/2004 20:30 CET" ffmpeg
 		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure )
-		[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
+		#[ ! -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
@@ -62,7 +62,7 @@ else
 		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat.so" ]
 		then
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-			echo "LDFLAGS+=-L$shared_ffmpeg" >> config.mak
+			echo "LDFLAGS+=-L$shared_ffmpeg/lib" >> config.mak
 		else
 			echo "avformat: No build environment found. "
 			echo "          Try configuring mlt with --avformat-cvs."
@@ -80,6 +80,7 @@ EOF
 cat << EOF >> ../filters.dat
 avdeinterlace	libmltavformat.so
 avresample		libmltavformat.so
+avcolour_space	libmltavformat.so
 EOF
 
 cat << EOF >> ../consumers.dat