X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=3dd7e63e13bc3a8fae4b91bafaa6dcb3061aa2b2;hb=7ecd47eeebf87332a4892d167baff959f0f6a11a;hp=33969449f64d2b618339634424cf4a53ae361052;hpb=4103aa118494f46a74a2229a90ac7aa47eb0eb00;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 3396944..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" != "" ]
@@ -96,6 +96,7 @@ else
 		[ $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
-