bump to version 0.3.8

[melted] / src / modules / avformat / configure

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 3dd7e63..b6c6945 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -1,5 +1,12 @@
 #!/bin/sh
 
+# 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.
+svn_rev="17923"
+micro_version=$(echo $version | cut -d . -f 3)
+odd_version=$(($micro_version % 2))
+[ "$odd_version" -eq "1" ] && svn_rev="HEAD"
 
 if [ "$help" = "1" ]
 then
@@ -13,6 +20,10 @@ FFMPEG/avformat options:
   --avformat-ldextra=libs - Provide additional libs to link with
   --avformat-suffix=suff  - Specify a custom suffix for an ffmpeg shared build
   --avformat-swscale      - Use ffmpeg libswcale instead of img_convert
+  --avformat-no-codecs    - Disable the producer and consumer to avoid the FFmpeg codecs
+  --avformat-no-filters   - Disable the filters to make a codecs+muxers-only plugin
+
+  NOTE: The recommended version of FFmpeg is SVN-r$svn_rev.
 
 EOF
 
@@ -48,6 +59,8 @@ else
        export svn_ffmpeg_extra=
        export avformat_suffix=
        export swscale=
+       export codecs=true
+       export filters=true
 
        for i in "$@"
        do
@@ -61,6 +74,8 @@ else
                        --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 ;;
                esac
        done
 
@@ -85,9 +100,9 @@ else
                if [ ! -d "ffmpeg" ]
                then
                        echo
-                       echo "Checking out ffmpeg/avformat - no password required"
+                       echo "Checking out ffmpeg/avformat revision $svn_rev - no password required"
                        echo
-                       svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
+                       svn checkout -r $svn_rev svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
                fi
                [ -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 )
@@ -97,7 +112,7 @@ else
                        echo "LDFLAGS+=-single_module" >> config.mak
                echo "LOCAL_FFMPEG=1" >> config.mak
                echo "LDFLAGS+=-Wl,-Bsymbolic" >> config.mak
-               extra_libs="$extra_libs -lz"
+               extra_libs="$extra_libs -lz -lbz2"
        elif [ "$static_ffmpeg" != "" ]
        then 
                if [ -d "$static_ffmpeg" ]
@@ -145,5 +160,8 @@ else
 
        echo "EXTRA_LIBS=$extra_libs" >> config.mak
        echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
+       [ "$codecs" = "true" ] && echo "CODECS=1" >> config.mak
+       [ "$filters" = "true" ] && echo "FILTERS=1" >> config.mak
+       exit 0
 
 fi