From 879a0de9be6830e6f18a24f6c634873c8ce51ad6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Thu, 14 Sep 2006 02:04:48 +0000
Subject: 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
---
 src/libspeex/xine_decoder.c | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'src/libspeex')

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
 
-- 
cgit v1.2.3