From: Stephane L. <ler...@pd...> - 2004-05-20 21:57:26
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: leroutier Date: Thu May 20 2004 14:57:23 PDT Log message: - reenable speex plugins for speex 1.1.5 (API/ABI compatible with 1.0.x) - fix a cast warning that prevent compilation of speexenc Modified files: . : configure.ac ext/speex : gstspeexenc.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/configure.ac.diff?r1=1.422&r2=1.423 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ext/speex/gstspeexenc.c.diff?r1=1.19&r2=1.20 ====Begin Diffs==== Index: configure.ac =================================================================== RCS file: /cvs/gstreamer/gst-plugins/configure.ac,v retrieving revision 1.422 retrieving revision 1.423 diff -u -d -r1.422 -r1.423 --- a/configure.ac 20 May 2004 21:53:49 -0000 1.422 +++ b/configure.ac 20 May 2004 21:57:11 -0000 1.423 @@ -1425,12 +1425,24 @@ 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 translit(dnm, m, l) AM_CONDITIONAL(USE_SPEEX, true) GST_CHECK_FEATURE(SPEEX, [speex plug-in], speex, [ 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" SPEEX_LIBS="-lspeex" AC_SUBST(SPEEX_CFLAGS) Index: gstspeexenc.c RCS file: /cvs/gstreamer/gst-plugins/ext/speex/gstspeexenc.c,v retrieving revision 1.19 retrieving revision 1.20 diff -u -d -r1.19 -r1.20 --- a/gstspeexenc.c 9 May 2004 14:37:15 -0000 1.19 +++ b/gstspeexenc.c 20 May 2004 21:57:11 -0000 1.20 @@ -151,7 +151,7 @@ gst_element_add_pad (GST_ELEMENT (speexenc), speexenc->srcpad); speex_bits_init (&speexenc->bits); - speexenc->mode = &speex_nb_mode; + speexenc->mode = (SpeexMode *) & speex_nb_mode; speexenc->bufsize = 0; speexenc->packet_count = 0; speexenc->n_packets = 20; |