diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-14 02:04:48 +0000 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2006-09-14 02:04:48 +0000 |
| commit | 879a0de9be6830e6f18a24f6c634873c8ce51ad6 (patch) | |
| tree | 64545ae883a9d5a07dbc9d5b2ba9ce3ea8c44007 /src | |
| parent | e54b7c5e549076cc9abc81d3a83ae274a96d5712 (diff) | |
| download | xine-lib-879a0de9be6830e6f18a24f6c634873c8ce51ad6.tar.gz xine-lib-879a0de9be6830e6f18a24f6c634873c8ce51ad6.tar.bz2 | |
Suppose we're using a Speex version new enough to have the speex subdir every time, to simplify configure checks.
CVS patchset: 8243
CVS date: 2006/09/14 02:04:48
Diffstat (limited to 'src')
| -rw-r--r-- | src/demuxers/demux_ogg.c | 9 | ||||
| -rw-r--r-- | src/libspeex/xine_decoder.c | 9 |
2 files changed, 2 insertions, 16 deletions
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index f3bbc1877..92eb6507d 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -19,7 +19,7 @@ */ /* - * $Id: demux_ogg.c,v 1.167 2006/07/10 22:08:13 dgp85 Exp $ + * $Id: demux_ogg.c,v 1.168 2006/09/14 02:04:48 dgp85 Exp $ * * demultiplexer for ogg streams * @@ -43,17 +43,10 @@ #include <vorbis/codec.h> #ifdef HAVE_SPEEX -#ifdef HAVE_SPEEX_SUBDIR #include <speex/speex.h> #include <speex/speex_header.h> #include <speex/speex_stereo.h> #include <speex/speex_callbacks.h> -#else -#include <speex.h> -#include <speex_header.h> -#include <speex_stereo.h> -#include <speex_callbacks.h> -#endif #endif #ifdef HAVE_THEORA diff --git a/src/libspeex/xine_decoder.c b/src/libspeex/xine_decoder.c index 2ee6a643c..e324eb3ed 100644 --- a/src/libspeex/xine_decoder.c +++ b/src/libspeex/xine_decoder.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: xine_decoder.c,v 1.20 2006/07/10 22:08:30 dgp85 Exp $ + * $Id: xine_decoder.c,v 1.21 2006/09/14 02:07:01 dgp85 Exp $ * * (ogg/)speex audio decoder plugin (libspeex wrapper) for xine */ @@ -42,17 +42,10 @@ #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 |