From dbfc737cd24f6d03e6488e4d2db2ec8114821138 Mon Sep 17 00:00:00 2001 From: Mark Nauwelaerts Date: Mon, 11 Aug 2008 15:16:14 +0000 Subject: configure.ac: Check for sufficiently up-to-date x264 API. Original commit message from CVS: * configure.ac: Check for sufficiently up-to-date x264 API. * ext/x264/gstx264enc.c: (gst_x264_enc_pass_get_type), (gst_x264_enc_base_init), (gst_x264_enc_class_init), (gst_x264_enc_init), (gst_x264_enc_init_encoder), (gst_x264_enc_set_property), (gst_x264_enc_get_property): * ext/x264/gstx264enc.h: Expose some more parameters of the x264 encoder as properties. --- configure.ac | 21 +++++++++++++++++---- 1 file changed, 17 insertions(+), 4 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index 6cc8aac1..eac91a3b 100644 --- a/configure.ac +++ b/configure.ac @@ -1056,10 +1056,23 @@ 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, - X264_LIBS="$LDFLAGS -lx264 -lm" - X264_CFLAGS="$CFLAGS" - AC_SUBST(X264_LIBS) - AC_SUBST(X264_CFLAGS)) + AC_MSG_CHECKING([for uptodate x264 API version]) + dnl _stdint not yet generated, so no compiling + AC_TRY_CPP([ + #include + #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 *** -- cgit v1.2.1