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

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index a57172a..3dd7e63 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -124,11 +124,16 @@ else
 		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/libswscale" >> config.mak
+			[ -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