From: Conrad P. <co...@us...> - 2004-08-30 12:33:16
|
Update of /cvsroot/xine/xine-lib/src/libspeex In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv18486/src/libspeex Modified Files: xine_decoder.c Log Message: add support for speex headers in new location (eg. <speex/speex.h>) for libspeex-1.1.x: - Retain compatability for <speex.h> etc. from libspeex-1.0.x - Also try speex via pkg-config, and fall back to old AM_PATH_SPEEX Index: xine_decoder.c =================================================================== RCS file: /cvsroot/xine/xine-lib/src/libspeex/xine_decoder.c,v retrieving revision 1.11 retrieving revision 1.12 diff -u -r1.11 -r1.12 --- xine_decoder.c 12 Jan 2004 17:35:17 -0000 1.11 +++ xine_decoder.c 30 Aug 2004 12:33:08 -0000 1.12 @@ -40,10 +40,18 @@ #include "buffer.h" #include <ogg/ogg.h> + +#ifndef HAVE_SPEEX_SUBDIR #include <speex.h> #include <speex_header.h> #include <speex_callbacks.h> #include <speex_stereo.h> +#else +#include <speex/speex.h> +#include <speex/speex_header.h> +#include <speex/speex_callbacks.h> +#include <speex/speex_stereo.h> +#endif #define MAX_FRAME_SIZE 2000 |