summaryrefslogtreecommitdiffstats
path: root/configure.ac
diff options
context:
space:
mode:
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac33
1 files changed, 5 insertions, 28 deletions
diff --git a/configure.ac b/configure.ac
index 294348d7..7cc268ad 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@ AC_PREREQ(2.52)
dnl initialize autoconf
dnl when going to/from release please set the nano (fourth number) right !
dnl releases only do Wall, cvs and prerelease does Werror too
-AC_INIT(GStreamer Bad Plug-ins, 0.10.12.1,
+AC_INIT(GStreamer Bad Plug-ins, 0.10.13.1,
http://bugzilla.gnome.org/enter_bug.cgi?product=GStreamer,
gst-plugins-bad)
@@ -45,8 +45,8 @@ AC_LIBTOOL_WIN32_DLL
AM_PROG_LIBTOOL
dnl *** required versions of GStreamer stuff ***
-GST_REQ=0.10.22.1
-GSTPB_REQ=0.10.22.1
+GST_REQ=0.10.23.1
+GSTPB_REQ=0.10.23.1
dnl *** autotools stuff ****
@@ -265,6 +265,7 @@ AG_GST_CHECK_PLUGIN(dtmf)
AG_GST_CHECK_PLUGIN(dvdspu)
AG_GST_CHECK_PLUGIN(festival)
AG_GST_CHECK_PLUGIN(freeze)
+AG_GST_CHECK_PLUGIN(frei0r)
AG_GST_CHECK_PLUGIN(h264parse)
AG_GST_CHECK_PLUGIN(hdvparse)
AG_GST_CHECK_PLUGIN(id3tag)
@@ -1367,29 +1368,6 @@ AG_GST_CHECK_FEATURE(THEORADEC, [ogg theora codec], theoraexpdec, [
AC_SUBST(THEORADEC_CFLAGS)
])
-dnl *** x264 (MPEG-4 part 10/h.264/AVC encoder) ***
-translit(dnm, m, l) AM_CONDITIONAL(USE_X264, true)
-AG_GST_CHECK_FEATURE(X264, [x264 plug-in], x264, [
- AG_GST_CHECK_LIBHEADER(X264, x264, x264_nal_encode, -lm, x264.h,
- AC_MSG_CHECKING([for uptodate x264 API version])
- dnl _stdint not yet generated, so no compiling
- AC_TRY_CPP([
- #include <x264.h>
- #if X264_BUILD < 55
- #error "x264 build too old"
- #endif
- ], [
- AC_MSG_RESULT(yes)
- X264_LIBS="$LDFLAGS -lx264 -lm"
- X264_CFLAGS="$CFLAGS"
- AC_SUBST(X264_LIBS)
- AC_SUBST(X264_CFLAGS)
- ], [
- AC_MSG_RESULT(no)
- HAVE_X264=no
- ]))
-])
-
dnl *** XVID ***
translit(dnm, m, l) AM_CONDITIONAL(USE_XVID, true)
AG_GST_CHECK_FEATURE(XVID, [xvid plugins], xvid, [
@@ -1502,7 +1480,6 @@ AM_CONDITIONAL(USE_SPC, false)
AM_CONDITIONAL(USE_SWFDEC, false)
AM_CONDITIONAL(USE_THEORADEC, false)
AM_CONDITIONAL(USE_TIMIDITY, false)
-AM_CONDITIONAL(USE_X264, false)
AM_CONDITIONAL(USE_XVID, false)
AM_CONDITIONAL(USE_WILDMIDI, false)
AM_CONDITIONAL(USE_WININET, false)
@@ -1589,6 +1566,7 @@ gst/dtmf/Makefile
gst/dvdspu/Makefile
gst/festival/Makefile
gst/freeze/Makefile
+gst/frei0r/Makefile
gst/h264parse/Makefile
gst/hdvparse/Makefile
gst/id3tag/Makefile
@@ -1690,7 +1668,6 @@ ext/spc/Makefile
ext/swfdec/Makefile
ext/theora/Makefile
ext/timidity/Makefile
-ext/x264/Makefile
ext/xvid/Makefile
po/Makefile.in
docs/Makefile