autogen.sh: Fix call to ffmpegrev

Original commit message from CVS:
* autogen.sh:
Fix call to ffmpegrev
* configure.ac:
Re-apply -fPIC extra-cflag for ffmpeg while removing support for the
flac encoder which is currently broken for x86/32bits with -fPIC.
* ffmpegrev:
Switch to latest upstream revision so we can have the split-up for
flac mmx optimizations.

5 files changed, 15 insertions, 8 deletions

diff --git a/ChangeLog b/ChangeLog
index afac000..a862410 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2007-12-17  Edward Hervey  <edward.hervey@collabora.co.uk>
+
+	* autogen.sh:
+	Fix call to ffmpegrev
+	* configure.ac:
+	Re-apply -fPIC extra-cflag for ffmpeg while removing support for the
+	flac encoder which is currently broken for x86/32bits with -fPIC.
+	* ffmpegrev:
+	Switch to latest upstream revision so we can have the split-up for
+	flac mmx optimizations.
+
 2007-12-15  Sebastian Dröge  <slomo@circular-chaos.org>
 
 	Based on a patch by:
diff --git a/autogen.sh b/autogen.sh
index 5fedf2b..62c8327 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -6,10 +6,7 @@ package=gst-ffmpeg
 srcfile=configure.ac
 
 # FFMPEG specific properties
-. ffmpegrev
-
-# ffmpeg revisions that work: 6315, 10844, 10876, 10910, 10932, 10939
-
+. ./ffmpegrev
 
 # a quick cvs co if necessary to alleviate the pain - may remove this
 # when developers get a clue ;)
diff --git a/common b/common
-Subproject ea5f2cfab1a164a5d285fe745343cbe0a476a90
+Subproject a00d4c1966aab517c2694c61d580489ebcbce44
diff --git a/configure.ac b/configure.ac
index d85504c..a6fc72d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,8 +270,7 @@ else
   FFMPEG_SUBDIRS=gst-libs
   AC_DEFINE(HAVE_AVI_H)
   AC_DEFINE([FFMPEG_SOURCE], ["local snapshot"], [Describes where the FFmpeg libraries come from.])
-  ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-pp --enable-gpl --enable-static --disable-shared" # --extra-cflags=-fPIC"
-  # FIXME : the -fPIC cflag is required when compiling on x86_64 apparently :(
+  ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-pp --enable-gpl --enable-static --disable-shared --disable-encoder=flac --disable-cavs --extra-cflags=-fPIC"
   AC_SUBST(FFMPEG_CO_DIR)
   AC_SUBST(FFMPEG_SVN)
   AC_SUBST(FFMPEG_REVISION)
diff --git a/ffmpegrev b/ffmpegrev
index a1c8ca8..1810c9b 100644
--- a/ffmpegrev
+++ b/ffmpegrev
@@ -1,4 +1,4 @@
 # 6315, 10844, 10876, 10910, 10932, 10939
-FFMPEG_REVISION=11109
+FFMPEG_REVISION=11247
 FFMPEG_CO_DIR=gst-libs/ext/ffmpeg
-FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk
\ No newline at end of file
+FFMPEG_SVN=svn://svn.mplayerhq.hu/ffmpeg/trunk