gop size == 0 fix and update to current ffmpeg for cvs co

[melted] / src / modules / avformat / configure

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index a3be0c6..3be869f 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -1,11 +1,90 @@
-#!/bin/bash
+#!/bin/sh
 
-if [ "$help" != "1" ]
+if [ "$help" = "1" ]
 then
+       cat << EOF
+FFMPEG/avformat options:
+
+  --avformat-cvs          - Obtain ffmpeg from CVS
+  --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
+
+EOF
+
+else
+       echo > config.mak
+
+       export static_ffmpeg=
+       export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
+       export extra_libs=
+       export cvs_ffmpeg=
+
+       if [ "$shared_ffmpeg" != "" ]
+       then
+               # Chop ffmpeg 
+               shared_ffmpeg=`dirname $shared_ffmpeg`
+               # Chop bin 
+               shared_ffmpeg=`dirname $shared_ffmpeg`
+       fi
+
+       for i in "$@"
+       do
+               case $i in
+                       --avformat-static=* )   static_ffmpeg="${i#--avformat-static=}" ;;
+                       --avformat-shared=* )   shared_ffmpeg="${i#--avformat-shared=}" ;;
+                       --avformat-ldextra=* )  extra_libs="${i#--avformat-ldextra=}" ;;
+                       --avformat-cvs )                cvs_ffmpeg=true ;;
+               esac
+       done
+
+       if [ "$cvs_ffmpeg" != "" ]
+       then
+               [ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D "8/5/2004 15:30 CET" ffmpeg
+               [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure )
+               #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
+               echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec" >> config.mak
+               echo "LDFLAGS+=-L`pwd`/ffmpeg/libavformat -L`pwd`/ffmpeg/libavcodec" >> config.mak
+               echo "LOCAL_FFMPEG=1" >> config.mak
+               extra_libs="$extra_libs -lz"
+       elif [ "$static_ffmpeg" != "" ]
+       then 
+               if [ -d "$static_ffmpeg" ]
+               then
+                       echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec" >> config.mak
+                       echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec" >> config.mak
+               else
+                       echo "avformat: Invalid path specified: $static_ffmpeg"
+                       touch ../disable-avformat
+                       echo 0
+               fi
+       else 
+               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat.so" ]
+               then
+                       echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
+                       echo "LDFLAGS+=-L$shared_ffmpeg" >> config.mak
+               else
+                       echo "avformat: No build environment found. "
+                       echo "          Try configuring mlt with --avformat-cvs."
+                       touch ../disable-avformat
+                       exit 0
+               fi
+       fi
+
+       echo "EXTRA_LIBS=$extra_libs" >> config.mak
 
 cat << EOF >> ../producers.dat
 avformat               libmltavformat.so
 EOF
 
+cat << EOF >> ../filters.dat
+avdeinterlace  libmltavformat.so
+avresample             libmltavformat.so
+EOF
+
+cat << EOF >> ../consumers.dat
+avformat               libmltavformat.so
+EOF
+
 fi