avformat/configure: add --avformat-svn-extra

avformat/Makefile: rebuild module when local ffmpeg changes

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1010 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index c3031ef0e30d793cdeaba84a1fd7982741d441fa..8d45fc6a2071d093053b1350cf83f833d45c5b18 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -24,14 +24,22 @@ ifdef SWSCALE
        LDFLAGS+=-lswscale$(AVFORMAT_SUFFIX)
 endif
 
+ifdef LOCAL_FFMPEG
+       LOCAL_FFMPEG_OBJS = ffmpeg/libavformat/libavformat$(AVFORMAT_SUFFIX) \
+                           ffmpeg/libavcodec/libavcodec$(AVFORMAT_SUFFIX) \
+                           ffmpeg/libavutil/libavutil$(AVFORMAT_SUFFIX)
+endif
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)
 
-$(TARGET): $(OBJS)
+$(LOCAL_FFMPEG_OBJS):
                if [ $(LOCAL_FFMPEG) ] ; then \
                        $(MAKE) -C ffmpeg lib ; \
                fi
+
+$(TARGET): $(OBJS) $(LOCAL_FFMPEG_OBJS)
                $(CC) $(SHFLAGS) -o $@ $(OBJS) $(LDFLAGS)
 
 depend:        $(SRCS)

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 96dda2b218fd774594c4c3707246c5ee684a8ba1..91713726620825b11d88987c54546701f71ae72c 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -7,6 +7,7 @@ then
 FFMPEG/avformat options:
 
   --avformat-svn          - Obtain ffmpeg from Subversion
+  --avformat-svn-extra    - Add extra configure options for --avformat-svn
   --avformat-shared=path  - Link against a shared installation of ffmpeg (default)
   --avformat-static=path  - Link against a static ffmpeg dev tree
   --avformat-ldextra=libs - Provide additional libs to link with
@@ -44,6 +45,7 @@ else
        export shared_ffmpeg=`which ffmpeg`
        export extra_libs=
        export svn_ffmpeg=
+       export svn_ffmpeg_extra=
        export avformat_suffix=
        export swscale=
 
@@ -62,9 +64,11 @@ else
                        --avformat-shared=* )   shared_ffmpeg="${i#--avformat-shared=}" ;;
                        --avformat-ldextra=* )  extra_libs="${i#--avformat-ldextra=}" ;;
                        --avformat-svn )                svn_ffmpeg=true ;;
+                       --avformat-svn-extra=* ) svn_ffmpeg_extra="${i#--avformat-svn-extra=}" ;;
                        --avformat-cvs )                svn_ffmpeg=true ;;
                        --avformat-suffix=* )   avformat_suffix="${i#--avformat-suffix=}" ;;
                        --avformat-swscale )    swscale=true ;;
+                       --avformat-swscaler )   swscale=true ;;
                esac
        done
 
@@ -93,7 +97,7 @@ else
                        echo
                        svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
                fi
-               [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale )
+               [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure $enable_gpl $enable_swscale $svn_ffmpeg_extra )
                #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
                echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil -I`pwd`/ffmpeg/libswscale" >> config.mak
                echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec -L`pwd`/ffmpeg/libavutil -L`pwd`/ffmpeg/libswscale" >> config.mak