X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=3dd7e63e13bc3a8fae4b91bafaa6dcb3061aa2b2;hb=8fed66dc54b72d56b6eda6cc266d16eb33979020;hp=ea28196cc37ee62f0a110b43430eb312ce1745bc;hpb=36a97c4faa81ca406114b74d91912129e8703e3b;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index ea28196..3dd7e63 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -71,7 +71,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" != "" ]
@@ -91,11 +91,12 @@ else
 		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/libavdevice -I`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
+		echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
 		extra_libs="$extra_libs -lz"
 	elif [ "$static_ffmpeg" != "" ]
 	then 
@@ -111,6 +112,8 @@ 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
@@ -118,9 +121,21 @@ else
 		fi
 	elif [ "$shared_ffmpeg" != "" ]
 	then
-		echo "CFLAGS+=$(pkg-config --cflags libavformat)" >> config.mak
+		echo "PREFIX=$shared_ffmpeg" >> config.mak
+		echo "CFLAGS+=$(pkg-config --cflags libavformat) $TMP_CFLAGS" >> config.mak
 		echo "LDFLAGS+=$(pkg-config --libs libavformat)" >> config.mak
-		[ "$swscale" != "" ] && echo "SWSCALE=1" >> 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
+			[ -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."
@@ -132,4 +147,3 @@ else
 	echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
 
 fi
-