Move rotoscoping filter into plusgpl module.

[mlt] / src / modules / avformat / configure

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 5e3a7a245da00950d4e7c9e5c1d047025b998260..531d3af79db2ffd0de9679af560c04d91c1f977c 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -3,8 +3,8 @@
 # Determine whether to recommend/use the HEAD revision of FFmpeg (unreleased)
 # or a specific revision based upon whether the last digit of our version
 # is even or odd. An odd MLT version number always represents unreleased.
-ffmpeg_ver="0.8"
-libav_ver="0.7"
+ffmpeg_ver="1.2"
+libav_ver="0.8.7"
 micro_version=$(echo $version | cut -d . -f 3)
 odd_version=$(($micro_version % 2))
 [ "$odd_version" -eq "1" ] && ffmpeg_ver="HEAD" && libav_ver="HEAD"
@@ -17,7 +17,6 @@ FFmpeg/avformat options:
   --avformat-shared=path  - Link against a shared installation of libavformat (default)
   --avformat-static=path  - Link against a static build of libavformat
   --avformat-ldextra=libs - Provide additional libs to link with
-  --avformat-swscale      - Use libswcale instead of img_convert (with --avformat-static)
   --avformat-suffix=suff  - Specify a custom suffix
   --avformat-no-codecs    - Disable the producer and consumer to avoid the codecs
   --avformat-no-filters   - Disable the filters to make a codecs+muxers-only plugin
@@ -54,10 +53,9 @@ else
        echo > config.mak
 
        export static_ffmpeg=
-       export shared_ffmpeg=$(pkg-config --variable=prefix libavformat)
+       export shared_ffmpeg=
        export extra_libs=
        export avformat_suffix=
-       export swscale=
        export codecs=true
        export filters=true
        export devices=true
@@ -72,8 +70,6 @@ else
                        --avformat-shared=* )   shared_ffmpeg="${i#--avformat-shared=}" ;;
                        --avformat-ldextra=* )  extra_libs="${i#--avformat-ldextra=}" ;;
                        --avformat-suffix=* )   avformat_suffix="${i#--avformat-suffix=}" ;;
-                       --avformat-swscale )    swscale=true ;;
-                       --avformat-swscaler )   swscale=true ;;
                        --avformat-no-codecs )  codecs=false ;;
                        --avformat-no-filters ) filters=false ;;
                        --avformat-no-devices ) devices=false ;;
@@ -82,6 +78,8 @@ else
                esac
        done
 
+       : ${shared_ffmpeg:=$(pkg-config --variable=prefix libavformat${avformat_suffix})}
+
        if [ "$static_ffmpeg" != "" ]
        then 
                if [ -d "$static_ffmpeg" ]
@@ -89,13 +87,9 @@ else
                        echo "CFLAGS+=-DAVDATADIR=\\\"${static_ffmpeg}/ffpresets/\\\"" >> config.mak
                        echo "CFLAGS+=-I$static_ffmpeg" >> config.mak
                        echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
+                       echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
                        [ $targetos = "Darwin" ] &&
                                echo "LDFLAGS+=-single_module" >> config.mak
-                       if [ "$swscale" != "" ]
-                       then
-                               echo "LDFLAGS+=-L$static_ffmpeg/libswscale" >> config.mak
-                               echo "SWSCALE=1" >> config.mak
-                       fi
                        if [ "$devices" = "true" ]
                        then
                                echo "LDFLAGS+=-L$static_ffmpeg/libavdevice" >> config.mak
@@ -105,7 +99,7 @@ else
                        
                        if [ "$vdpau" = "true" ]
                        then
-                               printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | gcc -I"$static_ffmpeg" $CFLAGS -c -x c -  >/dev/null 2>&1
+                               printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC -I"$static_ffmpeg" $CFLAGS -c -x c -  >/dev/null 2>&1
                                [ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
                        fi
                else
@@ -115,33 +109,38 @@ else
                fi
        elif [ "$shared_ffmpeg" != "" ]
        then
+               if ! $(pkg-config libswscale${avformat_suffix}); then
+                       echo "- libswscale not found: disabling"
+                       touch ../disable-avformat
+                       exit 0
+               fi
                echo "PREFIX=$shared_ffmpeg" >> config.mak
                case $targetos in
                        MINGW32_NT-*)
                                echo "CFLAGS+=-DAVDATADIR=\\\"share/ffmpeg/\\\"" >> config.mak
                        ;;
                        *)
-                               echo "CFLAGS+=-DAVDATADIR=\\\"${shared_ffmpeg}/share/ffmpeg/\\\"" >> config.mak
+                               echo "CFLAGS+=-DAVDATADIR=\\\"${shared_ffmpeg}/share/ffmpeg${avformat_suffix}/\\\"" >> config.mak
                        ;;
                esac
-               echo "CFLAGS+=$(pkg-config --cflags libavformat)" >> config.mak
-               echo "LDFLAGS+=$(pkg-config --libs-only-L libavformat)" >> config.mak
+               echo "CFLAGS+=$(pkg-config --cflags libavformat${avformat_suffix})" >> config.mak
+               echo "LDFLAGS+=$(pkg-config --libs-only-L libavformat${avformat_suffix})" >> config.mak
+               echo "CFLAGS+=$(pkg-config --cflags libswscale${avformat_suffix})" >> config.mak
+               echo "LDFLAGS+=$(pkg-config --libs-only-L libswscale${avformat_suffix})" >> config.mak
                if [ "$devices" = "true" ]
                then
-                       echo "CFLAGS+=$(pkg-config --cflags libavdevice)" >> config.mak
-                       echo "LDFLAGS+=$(pkg-config --libs-only-L libavdevice)" >> config.mak
-               fi
-               avcodec_version=$(pkg-config --modversion libavcodec)
-               if [ "$swscale" != "" ] || [ $(echo $avcodec_version | cut -d. -f1) -gt 52 ] || ( [ $(echo $avcodec_version | cut -d. -f1) -ge 52 ] && [ $(echo $avcodec_version | cut -d. -f2) -ge 21 ] )
-               then
-                       echo "CFLAGS+=$(pkg-config --cflags libswscale)" >> config.mak
-                       echo "LDFLAGS+=$(pkg-config --libs-only-L libswscale)" >> config.mak
-                       echo "SWSCALE=1" >> config.mak
+                       if ! $(pkg-config libavdevice${avformat_suffix}); then
+                               echo "- libavdevice not found: disabling"
+                               touch ../disable-avformat
+                               exit 0
+                       fi
+                       echo "CFLAGS+=$(pkg-config --cflags libavdevice${avformat_suffix})" >> config.mak
+                       echo "LDFLAGS+=$(pkg-config --libs-only-L libavdevice${avformat_suffix})" >> config.mak
                fi
                
                if [ "$vdpau" = "true" ]
                then
-                       printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | gcc -I"$(pkg-config --cflags libavformat)" -I"$shared_ffmpeg/include" $CFLAGS -c -x c -  >/dev/null 2>&1
+                       printf "#include <libavcodec/vdpau.h>\n int main(){ VdpBitstreamBuffer test; test.struct_version; return 0;}" | $CC $(pkg-config --cflags libavformat${avformat_suffix}) -I"$shared_ffmpeg/include" $CFLAGS -c -x c -  >/dev/null 2>&1
                        [ "$x11" = "0" -a "$?" = "0" ] && echo "VDPAU=1" >> config.mak
                fi
        else