From 5df4c86c17d45797e69c51ac984ef8bc6d44a189 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 11 Nov 2009 10:54:25 +0100 Subject: [PATCH] celt: Make celt version checks better extensible --- configure.ac | 22 +++++++++++++++------- ext/celt/gstceltenc.c | 6 +++--- 2 files changed, 18 insertions(+), 10 deletions(-) diff --git a/configure.ac b/configure.ac index e2d6ef0..fb688c5 100644 --- a/configure.ac +++ b/configure.ac @@ -661,15 +661,23 @@ AG_GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [ dnl *** celt *** translit(dnm, m, l) AM_CONDITIONAL(USE_CELT, true) AG_GST_CHECK_FEATURE(CELT, [celt], celt, [ - PKG_CHECK_MODULES(CELT, celt >= 0.5.0, [ - HAVE_CELT="yes"], [ - PKG_CHECK_MODULES(CELT, celt >= 0.4.0, [ + PKG_CHECK_MODULES(CELT, celt >= 0.4.0, [ HAVE_CELT="yes" - AC_DEFINE([HAVE_CELT_0_4], 1, [Define if libcelt 0.4 is installed]) - ],[ - HAVE_CELT="no" + ], [ + AC_MSG_RESULT(no) + HAVE_CELT="no" + ]) + + PKG_CHECK_MODULES(CELT_0_5, celt >= 0.5.0, [ + AC_DEFINE([HAVE_CELT_0_5], 1, [Define if libcelt 0.5 is installed]) + ], [ + AC_MSG_RESULT(no) + ]) + + PKG_CHECK_MODULES(CELT_0_7, celt >= 0.7.0, [ + AC_DEFINE([HAVE_CELT_0_7], 1, [Define if libcelt 0.7 is installed]) + ], [ AC_MSG_RESULT(no) - ]) ]) AC_SUBST(CELT_CFLAGS) AC_SUBST(CELT_LIBS) diff --git a/ext/celt/gstceltenc.c b/ext/celt/gstceltenc.c index 0689e2a..62934cd 100644 --- a/ext/celt/gstceltenc.c +++ b/ext/celt/gstceltenc.c @@ -777,13 +777,13 @@ gst_celt_enc_encode (GstCeltEnc * enc, gboolean flush) GST_DEBUG_OBJECT (enc, "encoding %d samples (%d bytes)", frame_size, bytes); -#ifdef HAVE_CELT_0_4 +#ifdef HAVE_CELT_0_5 outsize = - celt_encode (enc->state, data, + celt_encode (enc->state, data, NULL, GST_BUFFER_DATA (outbuf), bytes_per_packet); #else outsize = - celt_encode (enc->state, data, NULL, + celt_encode (enc->state, data, GST_BUFFER_DATA (outbuf), bytes_per_packet); #endif -- 2.7.4