oggvorbis stuff moved out from stheader.h

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2342 b3059339-0415-0410-9bf9-f77b7e298cf2

2 files changed, 15 insertions, 23 deletions

diff --git a/dec_audio.c b/dec_audio.c
index 699f7a8149..c6605886bc 100644
--- a/dec_audio.c
+++ b/dec_audio.c
@@ -18,10 +18,6 @@ int fakemono=0;
 #include "stream.h"
 #include "demuxer.h"
 
-#include "wine/mmreg.h"
-#include "wine/avifmt.h"
-#include "wine/vfw.h"
-
 #include "codec-cfg.h"
 #include "stheader.h"
 
@@ -44,6 +40,20 @@ int fakemono=0;
 /* XXX is math.h really needed? - atmos */
 #include <math.h>
 #include <vorbis/codec.h>
+
+typedef struct ov_struct_st {
+  ogg_sync_state   oy; /* sync and verify incoming physical bitstream */
+  ogg_stream_state os; /* take physical pages, weld into a logical
+			  stream of packets */
+  ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
+  ogg_packet       op; /* one raw packet of data for decode */
+  
+  vorbis_info      vi; /* struct that stores all the static vorbis bitstream
+			  settings */
+  vorbis_comment   vc; /* struct that stores all the bitstream user comments */
+  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
+  vorbis_block     vb; /* local working space for packet->PCM decode */
+} ov_struct_t;
 #endif
 
 #ifdef USE_LIBAVCODEC
diff --git a/libmpdemux/stheader.h b/libmpdemux/stheader.h
index cb8907bdae..0a5ad63c4f 100644
--- a/libmpdemux/stheader.h
+++ b/libmpdemux/stheader.h
@@ -4,24 +4,6 @@
 #include "wine/avifmt.h"
 #include "wine/vfw.h"
 
-#ifdef HAVE_OGGVORBIS
-#include <math.h>
-#include <vorbis/codec.h>
-typedef struct {
-  ogg_sync_state   oy; /* sync and verify incoming physical bitstream */
-  ogg_stream_state os; /* take physical pages, weld into a logical
-			  stream of packets */
-  ogg_page         og; /* one Ogg bitstream page.  Vorbis packets are inside */
-  ogg_packet       op; /* one raw packet of data for decode */
-  
-  vorbis_info      vi; /* struct that stores all the static vorbis bitstream
-			  settings */
-  vorbis_comment   vc; /* struct that stores all the bitstream user comments */
-  vorbis_dsp_state vd; /* central working state for the packet->PCM decoder */
-  vorbis_block     vb; /* local working space for packet->PCM decode */
-} ov_struct_t;
-#endif
-
 typedef struct {
   demux_stream_t *ds;
   unsigned int format;
@@ -56,7 +38,7 @@ typedef struct {
   void* ac3_frame;
   int pcm_bswap;
 #ifdef HAVE_OGGVORBIS
-  ov_struct_t *ov; // should be assigned on init
+  struct ov_struct_st *ov; // should be assigned on init
 #endif
 } sh_audio_t;