From 8d3bd7fa1b92ec485a961a9582a8a7797fb806cd Mon Sep 17 00:00:00 2001 From: ddennedy Date: Thu, 15 May 2008 16:43:23 +0000 Subject: [PATCH] avformat/configure: fix compilation against shared ffmpeg for a headers configuration that has appeared. git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1127 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/avformat/configure | 7 ++++++- 1 files changed, 6 insertions(+), 1 deletions(-) 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 -- 1.7.4.4