X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=b6c6945709b6751d2131661d8d3e804d051ee134;hb=bb2674a23b551cbc146d40ff7a122c87856b49ff;hp=e52d58e76c27307227793f6578332d9c88a846dc;hpb=16b6d374cf80004b192aae74a55b0452c7ee809d;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index e52d58e..b6c6945 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+# 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"
+micro_version=$(echo $version | cut -d . -f 3)
+odd_version=$(($micro_version % 2))
+[ "$odd_version" -eq "1" ] && svn_rev="HEAD"
 
 if [ "$help" = "1" ]
 then
@@ -13,6 +20,10 @@ FFMPEG/avformat options:
   --avformat-ldextra=libs - Provide additional libs to link with
   --avformat-suffix=suff  - Specify a custom suffix for an ffmpeg shared build
   --avformat-swscale      - Use ffmpeg libswcale instead of img_convert
+  --avformat-no-codecs    - Disable the producer and consumer to avoid the FFmpeg codecs
+  --avformat-no-filters   - Disable the filters to make a codecs+muxers-only plugin
+
+  NOTE: The recommended version of FFmpeg is SVN-r$svn_rev.
 
 EOF
 
@@ -42,20 +53,14 @@ else
 	echo > config.mak
 
 	export static_ffmpeg=
-	export shared_ffmpeg=`which ffmpeg`
+	export shared_ffmpeg=$(pkg-config --variable=prefix libavformat)
 	export extra_libs=
 	export svn_ffmpeg=
 	export svn_ffmpeg_extra=
 	export avformat_suffix=
 	export swscale=
-
-	if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
-	then
-		# Chop ffmpeg 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-		# Chop bin 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-	fi
+	export codecs=true
+	export filters=true
 
 	for i in "$@"
 	do
@@ -69,6 +74,8 @@ else
 			--avformat-suffix=* )	avformat_suffix="${i#--avformat-suffix=}" ;;
 			--avformat-swscale )	swscale=true ;;
 			--avformat-swscaler )	swscale=true ;;
+			--avformat-no-codecs )	codecs=false ;;
+			--avformat-no-filters )	filters=false ;;
 		esac
 	done
 
@@ -79,7 +86,7 @@ else
 			enable_gpl="--enable-gpl"
 			if [ "$swscale" != "" ]
 			then
-					enable_swscale="--enable-swscaler"
+					enable_swscale="--enable-swscale"
 					echo "SWSCALE=1" >> config.mak
 			fi
 		elif [ "$swscale" != "" ]
@@ -93,24 +100,25 @@ else
 		if [ ! -d "ffmpeg" ]
 		then
 			echo
-			echo "Checking out ffmpeg/avformat - no password required"
+			echo "Checking out ffmpeg/avformat revision $svn_rev - no password required"
 			echo
-			svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+			svn checkout -r $svn_rev svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
 		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/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libswscale" >> config.mak
-		echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -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 -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
 		[ $targetos = "Darwin" ] &&
 			echo "LDFLAGS+=-single_module" >> config.mak
 		echo "LOCAL_FFMPEG=1" >> config.mak
-		extra_libs="$extra_libs -lz"
+		echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
+		extra_libs="$extra_libs -lz -lbz2"
 	elif [ "$static_ffmpeg" != "" ]
 	then 
 		if [ -d "$static_ffmpeg" ]
 		then
-			echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec -I$static_ffmpeg/libavutil" >> config.mak
-			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
+			echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec -I$static_ffmpeg/libavutil -I$static_ffmpeg/libavdevice" >> config.mak
+			echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil -L$static_ffmpeg/libavdevice" >> config.mak
 			[ $targetos = "Darwin" ] &&
 			 	echo "LDFLAGS+=-single_module" >> config.mak
 			if [ "$swscale" != "" ]
@@ -119,27 +127,41 @@ else
 				echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
 				echo "SWSCALE=1" >> config.mak
 			fi
+			echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
+			extra_libs="$extra_libs -lz"
 		else
 			echo "avformat: Invalid path specified: $static_ffmpeg"
 			touch ../disable-avformat
 			echo 0
 		fi
-	else 
-		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -e "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
+	elif [ "$shared_ffmpeg" != "" ]
+	then
+		echo "PREFIX=$shared_ffmpeg" >> config.mak
+		echo "CFLAGS+=$(pkg-config --cflags libavformat) $TMP_CFLAGS" >> config.mak
+		echo "LDFLAGS+=$(pkg-config --libs libavformat)" >> config.mak
+		[ -d "$shared_ffmpeg/include/ffmpeg/libavformat" ] &&
+			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" != "" ]
 		then
-			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
-			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
-		else
-			echo "avformat: No build environment found. "
-			echo "          Try configuring mlt with --avformat-svn."
-			touch ../disable-avformat
-			exit 0
+			[ -d "$shared_ffmpeg/include/ffmpeg/libswscale" ] &&
+				echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg/libswscale" >> config.mak
+			[ -d "$shared_ffmpeg/include/libswscale" ] &&
+				echo "CFLAGS+=-I$shared_ffmpeg/include/libswscale" >> config.mak
+			echo "SWSCALE=1" >> config.mak
 		fi
+	else
+		echo "avformat: No build environment found. "
+		echo "          Try configuring mlt with --avformat-svn."
+		touch ../disable-avformat
+		exit 0
 	fi
 
 	echo "EXTRA_LIBS=$extra_libs" >> config.mak
 	echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
+	[ "$codecs" = "true" ] && echo "CODECS=1" >> config.mak
+	[ "$filters" = "true" ] && echo "FILTERS=1" >> config.mak
+	exit 0
 
 fi
-