[Mlt-devel] SF.net SVN: mlt:[1405] trunk/mlt/src/modules/avformat/configure

[<dde...@us...>]

Revision: 1405
          http://mlt.svn.sourceforge.net/mlt/?rev=1405&view=rev
Author:   ddennedy
Date:     2009-04-15 06:32:51 +0000 (Wed, 15 Apr 2009)

Log Message:
-----------
Fix build for --avformat-svn to use FFmpeg v0.5 and HEAD build to not
use --enable-swscale.
Signed-off-by: Dan Dennedy <da...@de...>

Modified Paths:
--------------
    trunk/mlt/src/modules/avformat/configure

Modified: trunk/mlt/src/modules/avformat/configure
===================================================================
--- trunk/mlt/src/modules/avformat/configure	2009-04-15 04:35:27 UTC (rev 1404)
+++ trunk/mlt/src/modules/avformat/configure	2009-04-15 06:32:51 UTC (rev 1405)
@@ -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="17923"
+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 @@
 			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 @@
 			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 )


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.