# HG changeset patch
# User Matti Hamalainen <ccr@tnsp.org>
# Date 1375716200 -10800
# Node ID ad838591513aefc4871a448b4d485b481a9f69b0
# Parent  e29773ac3cebab87c0b861c1c272cd4266012931# Parent  b6b0be5ac50cc32d550404c99cbb29b727cceb8a
Merged.

diff -r b6b0be5ac50c -r ad838591513a liboggplayer-src/src/imp.hpp
--- a/liboggplayer-src/src/imp.hpp	Mon Aug 05 18:11:20 2013 +0300
+++ b/liboggplayer-src/src/imp.hpp	Mon Aug 05 18:23:20 2013 +0300
@@ -5,7 +5,9 @@
 #include <fstream>
 #include <vector>
 #include <theora/theora.h>
+#ifdef VORBIS_SUPPORT
 #include <vorbis/codec.h>
+#endif
 #include <boost/thread.hpp>
 #include <boost/bind.hpp>
 #include <boost/thread/mutex.hpp>
@@ -52,10 +54,13 @@
 
 	ogg_sync_state o_sync;
 
+#ifdef VORBIS_SUPPORT
 	vorbis_comment v_comment;
+	vorbis_info v_info;
+#endif
+
 	theora_info t_info;
 	theora_comment t_comment;
-	vorbis_info v_info;
 
 	ogg_page o_page;
 	ogg_packet o_packet;
@@ -64,8 +69,11 @@
 	ogg_stream_state o_vsstate;
 
 	theora_state t_state;
+
+#ifdef VORBIS_SUPPORT
 	vorbis_dsp_state v_state;
 	vorbis_block v_block;
+#endif
 
 	int pp_level_max;
 	int pp_level;
diff -r b6b0be5ac50c -r ad838591513a liboggplayer-src/src/util.cpp
--- a/liboggplayer-src/src/util.cpp	Mon Aug 05 18:11:20 2013 +0300
+++ b/liboggplayer-src/src/util.cpp	Mon Aug 05 18:23:20 2013 +0300
@@ -5,8 +5,10 @@
 int OggPlayer::Imp::queue_page(ogg_page * page) {
 	if (theora_p)
 		ogg_stream_pagein(&o_tsstate, page);
+#ifdef VORBIS_SUPPORT
 	if (vorbis_p)
 		ogg_stream_pagein(&o_vsstate, page);
+#endif
 	return 0;
 }