]> git.sesse.net Git - mlt/commitdiff
avformat/configure: fix compilation against shared ffmpeg for a headers configuration...
authorddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Thu, 15 May 2008 16:43:23 +0000 (16:43 +0000)
committerddennedy <ddennedy@d19143bc-622f-0410-bfdd-b5b2a6649095>
Thu, 15 May 2008 16:43:23 +0000 (16:43 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1127 d19143bc-622f-0410-bfdd-b5b2a6649095

src/modules/avformat/configure

index a57172a420a86e8e1eceb7216572a19b6d912518..3dd7e63e13bc3a8fae4b91bafaa6dcb3061aa2b2 100755 (executable)
@@ -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