summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Hervey <bilboed@bilboed.com>2007-12-17 11:15:43 +0000
committerEdward Hervey <bilboed@bilboed.com>2007-12-17 11:15:43 +0000
commit7eee21122b781f3298e34a725e54b0c03b8395ab (patch)
treef1cb6a26b18f500c2d7b7ddf4ef95e6a3ac2e888
parentd0cf9fb57cb1a60583eeb978ba198c4822a58a24 (diff)
configure.ac: Minor typo in disabling cavs decoder. Now compiles AND works on x86 32 and 64 bits ! Time to merge :)GST_FFMPEG_NO_MIRROR
Original commit message from CVS: * configure.ac: Minor typo in disabling cavs decoder. Now compiles AND works on x86 32 and 64 bits ! Time to merge :)
-rw-r--r--ChangeLog6
-rw-r--r--configure.ac2
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 656d887..bd83d1b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2007-12-17 Edward Hervey <edward.hervey@collabora.co.uk>
+ * configure.ac:
+ Minor typo in disabling cavs decoder. Now compiles AND works on x86 32
+ and 64 bits ! Time to merge :)
+
+2007-12-17 Edward Hervey <edward.hervey@collabora.co.uk>
+
* ext/ffmpeg/gstffmpegcodecmap.c: (gst_ffmpeg_codecid_to_caps),
(gst_ffmpeg_caps_to_codecid):
* ext/ffmpeg/gstffmpegdec.c: (gst_ffmpegdec_open):
diff --git a/configure.ac b/configure.ac
index a6fc72d..614d1f6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -270,7 +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 --disable-encoder=flac --disable-cavs --extra-cflags=-fPIC"
+ ac_configure_args="$ac_configure_args --disable-vhook --disable-ffserver --disable-ffplay --enable-pp --enable-gpl --enable-static --disable-shared --disable-encoder=flac --disable-decoder=cavs --extra-cflags=-fPIC"
AC_SUBST(FFMPEG_CO_DIR)
AC_SUBST(FFMPEG_SVN)
AC_SUBST(FFMPEG_REVISION)