From 1c0343dcc2d3cb31b2a081c6c964c3e00fe2694e Mon Sep 17 00:00:00 2001
From: Conrad Parker <conrad@users.sourceforge.net>
Date: Mon, 30 Aug 2004 12:33:07 +0000
Subject: 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

CVS patchset: 6920
CVS date: 2004/08/30 12:33:07
---
 src/demuxers/demux_ogg.c | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'src/demuxers')

diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c
index 4a19aa022..304142bc9 100644
--- a/src/demuxers/demux_ogg.c
+++ b/src/demuxers/demux_ogg.c
@@ -19,7 +19,7 @@
  */
 
 /*
- * $Id: demux_ogg.c,v 1.151 2004/07/25 17:08:07 mroi Exp $
+ * $Id: demux_ogg.c,v 1.152 2004/08/30 12:33:07 conrad Exp $
  *
  * demultiplexer for ogg streams
  *
@@ -43,11 +43,18 @@
 #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
 #include <theora/theora.h>
-- 
cgit v1.2.3