mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 04:01:08 +00:00
Code Issues 1 Projects Releases Wiki Activity

- reenable speex plugins for speex 1.1.5 (API/ABI compatible with 1.0.x)

Browse source 
Original commit message from CVS:
- reenable speex plugins for speex 1.1.5 (API/ABI compatible with 1.0.x)
- fix a cast warning that prevent compilation of speexenc
This commit is contained in:
Stéphane Loeuillet 2004-05-20 21:57:11 +00:00
parent 7f23e53717
commit a4ee05fa18
2 changed files with 15 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
configure.ac
View file

@ -1425,12 +1425,24 @@ GST_CHECK_FEATURE(LIBPNG, [snapshot plug-in], snapshot, [
AC_SUBST(LIBPNG_LIBS) AC_SUBST(LIBPNG_LIBS)
]) ])
dnl *** speex 1.0 only, not 1.1 *** dnl *** speex 1.0.x or >= 1.1.5 (1.1.4 and earlier were not API/ABI compatible ***
dnl speex_jitter.h is 1.1 only dnl speex_jitter.h is 1.1 only
translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true) translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true)
GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [
GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, [ GST_CHECK_LIBHEADER(SPEEX, speex, speex_bits_init, , speex.h, [
AC_CHECK_HEADER(speex_jitter.h, HAVE_SPEEX="no", [ AC_CHECK_HEADER(speex_jitter.h, [
dnl speex 1.1.x :
GST_CHECK_LIBHEADER(SPEEX, speex, speex_encode_int, , speex.h, [
dnl speex 1.1.5 or + :
HAVE_SPEEX="yes"
SPEEX_LIBS="-lspeex"
AC_SUBST(SPEEX_CFLAGS)
AC_SUBST(SPEEX_LIBS)
],[
HAVE_SPEEX="no"
])
], [
dnl speex 1.0.x :
HAVE_SPEEX="yes" HAVE_SPEEX="yes"
SPEEX_LIBS="-lspeex" SPEEX_LIBS="-lspeex"
AC_SUBST(SPEEX_CFLAGS) AC_SUBST(SPEEX_CFLAGS)

2
ext/speex/gstspeexenc.c
View file

@ -151,7 +151,7 @@ gst_speexenc_init (GstSpeexEnc * speexenc)
gst_element_add_pad (GST_ELEMENT (speexenc), speexenc->srcpad); gst_element_add_pad (GST_ELEMENT (speexenc), speexenc->srcpad);
speex_bits_init (&speexenc->bits); speex_bits_init (&speexenc->bits);
speexenc->mode = &speex_nb_mode; speexenc->mode = (SpeexMode *) & speex_nb_mode;
speexenc->bufsize = 0; speexenc->bufsize = 0;
speexenc->packet_count = 0; speexenc->packet_count = 0;
speexenc->n_packets = 20; speexenc->n_packets = 20;