X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=f6ee3539b1feaf8030738d05a1541666fd5bcb07;hb=003e6b850aeeb5c596fa7e9d0048c4c5dd7af765;hp=365cb2cf69279d1cdfd57f09beeb74b814fcbb68;hpb=5dc7913c02c07dd97dba0fca6bac926af63dcdfc;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 365cb2c..f6ee353 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="15791"
+svn_rev="17887"
 micro_version=$(echo $version | cut -d . -f 3)
 odd_version=$(($micro_version % 2))
 [ "$odd_version" -eq "1" ] && svn_rev="HEAD"
@@ -86,7 +86,7 @@ else
 			enable_gpl="--enable-gpl"
 			if [ "$swscale" != "" ]
 			then
-					enable_swscale="--enable-swscale"
+					[ "$svn_rev" -eq "17887" ] && enable_swscale="--enable-swscale"
 					echo "SWSCALE=1" >> config.mak
 			fi
 		elif [ "$swscale" != "" ]
@@ -102,7 +102,11 @@ else
 			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" -eq "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 )
@@ -112,7 +116,7 @@ else
 			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" ]