X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=dc371a399b3f0b77eece80a1d4ef62a7f579fd23;hb=f4963a6aa07644399b273b5d2b1f9299c9047414;hp=4a0cd9c671b67333c0cf18a36b3178deb189be85;hpb=c85a59d0290651bbf938938e7e59407e165f8eed;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 4a0cd9c..dc371a3 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -3,7 +3,7 @@
 # Determine whether to recommend/use the HEAD revision of FFmpeg (unreleased)
 # or a specific revision based upon whether the last digit of our version
 # is even or odd. An odd MLT version number always represents unreleased.
-svn_rev="16313"
+svn_rev="17887"
 micro_version=$(echo $version | cut -d . -f 3)
 odd_version=$(($micro_version % 2))
 [ "$odd_version" -eq "1" ] && svn_rev="HEAD"
@@ -33,7 +33,7 @@ else
 	Darwin)
 		export LIBSUF=.dylib
 		;;
-	Linux)
+	Linux|FreeBSD)
 		export LIBSUF=.so
 		;;
 	*)
@@ -84,35 +84,35 @@ else
 		if [ "$gpl" = "true" ]
 		then
 			enable_gpl="--enable-gpl"
-			if [ "$swscale" != "" ]
-			then
-					enable_swscale="--enable-swscale"
-					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
+			[ "$swscale" != "" ] && [ "$svn_rev" = "17887" ] &&
+				enable_swscale="--enable-swscale"
 		fi
 		if [ ! -d "ffmpeg" ]
 		then
 			echo
 			echo "Checking out ffmpeg/avformat revision $svn_rev - no password required"
 			echo
-			svn checkout -r $svn_rev svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+			if [ "$svn_rev" = "17887" ]; then
+				svn checkout -r $svn_rev svn://svn.mplayerhq.hu/ffmpeg/branches/0.5 ffmpeg
+			else
+				svn checkout -r $svn_rev svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+			fi
 		fi
 		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale $svn_ffmpeg_extra )
 		#[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
-		echo "CFLAGS+=-I`pwd`/ffmpeg -I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libavdevice -I`pwd`/ffmpeg/libswscale" >> config.mak
-		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libavdevice -L`pwd`/ffmpeg/libswscale" >> config.mak
+		echo "CFLAGS+=-I`pwd`/ffmpeg -I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libavdevice" >> config.mak
+		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libavdevice" >> config.mak
+		if [ "$swscale" != "" ] || [ "$svn_rev" = "HEAD" ]
+		then
+			echo "CFLAGS+=-I`pwd`/ffmpeg/libswscale" >> config.mak
+			echo "LDFLAGS+=-L`pwd`/ffmpeg/libswscale" >> config.mak
+			echo "SWSCALE=1" >> config.mak
+		fi
 		[ $targetos = "Darwin" ] &&
 			echo "LDFLAGS+=-single_module" >> config.mak
 		echo "LOCAL_FFMPEG=1" >> config.mak
 		echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
-		extra_libs="$extra_libs -lz"
+		extra_libs="$extra_libs -lz -lbz2"
 	elif [ "$static_ffmpeg" != "" ]
 	then 
 		if [ -d "$static_ffmpeg" ]
@@ -143,7 +143,8 @@ else
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg/libavformat -I$shared_ffmpeg/include/ffmpeg/libavcodec" >> config.mak
 		[ -d "$shared_ffmpeg/include/libavformat" ] &&
 			echo "CFLAGS+=-I$shared_ffmpeg/include/libavformat -I$shared_ffmpeg/include/libavcodec" >> config.mak
-		if [ "$swscale" != "" ]
+		avcodec_version=$(pkg-config --modversion libavcodec)
+		if [ "$swscale" != "" ] || ( [ $(echo $avcodec_version | cut -d. -f1) -ge 52 ] && [ $(echo $avcodec_version | cut -d. -f2) -ge 21 ] )
 		then
 			[ -d "$shared_ffmpeg/include/ffmpeg/libswscale" ] &&
 				echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg/libswscale" >> config.mak