summaryrefslogtreecommitdiff
path: root/src/demuxers
diff options
context:
space:
mode:
authorDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-09-14 02:04:48 +0000
committerDiego 'Flameeyes' Pettenò <flameeyes@gmail.com>2006-09-14 02:04:48 +0000
commit879a0de9be6830e6f18a24f6c634873c8ce51ad6 (patch)
tree64545ae883a9d5a07dbc9d5b2ba9ce3ea8c44007 /src/demuxers
parente54b7c5e549076cc9abc81d3a83ae274a96d5712 (diff)
downloadxine-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/demuxers')
-rw-r--r--src/demuxers/demux_ogg.c9
1 files changed, 1 insertions, 8 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