producer_framebuffer.c: a little cleanup from last commit

[melted] / src / modules / avformat / configure

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 284d10e..3dd7e63 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -121,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."
@@ -135,4 +147,3 @@ else
        echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
 
 fi
-