celt: Make celt version checks better extensible
This commit is contained in:
parent
5cdcb21529
commit
5df4c86c17
14
configure.ac
14
configure.ac
@ -661,15 +661,23 @@ AG_GST_CHECK_FEATURE(CDAUDIO, [cdaudio], cdaudio, [
|
|||||||
dnl *** celt ***
|
dnl *** celt ***
|
||||||
translit(dnm, m, l) AM_CONDITIONAL(USE_CELT, true)
|
translit(dnm, m, l) AM_CONDITIONAL(USE_CELT, true)
|
||||||
AG_GST_CHECK_FEATURE(CELT, [celt], celt, [
|
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"
|
HAVE_CELT="yes"
|
||||||
AC_DEFINE([HAVE_CELT_0_4], 1, [Define if libcelt 0.4 is installed])
|
|
||||||
], [
|
], [
|
||||||
|
AC_MSG_RESULT(no)
|
||||||
HAVE_CELT="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)
|
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_CFLAGS)
|
||||||
AC_SUBST(CELT_LIBS)
|
AC_SUBST(CELT_LIBS)
|
||||||
|
@ -777,13 +777,13 @@ gst_celt_enc_encode (GstCeltEnc * enc, gboolean flush)
|
|||||||
|
|
||||||
GST_DEBUG_OBJECT (enc, "encoding %d samples (%d bytes)", frame_size, bytes);
|
GST_DEBUG_OBJECT (enc, "encoding %d samples (%d bytes)", frame_size, bytes);
|
||||||
|
|
||||||
#ifdef HAVE_CELT_0_4
|
#ifdef HAVE_CELT_0_5
|
||||||
outsize =
|
outsize =
|
||||||
celt_encode (enc->state, data,
|
celt_encode (enc->state, data, NULL,
|
||||||
GST_BUFFER_DATA (outbuf), bytes_per_packet);
|
GST_BUFFER_DATA (outbuf), bytes_per_packet);
|
||||||
#else
|
#else
|
||||||
outsize =
|
outsize =
|
||||||
celt_encode (enc->state, data, NULL,
|
celt_encode (enc->state, data,
|
||||||
GST_BUFFER_DATA (outbuf), bytes_per_packet);
|
GST_BUFFER_DATA (outbuf), bytes_per_packet);
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user