[Mplayer-cvslog] CVS: main/libmpdemux stheader.h,1.18,1.19

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mplayer:/var/tmp.root/cvs-serv3550

Modified Files:
	stheader.h 
Log Message:
oggvorbis stuff moved out from stheader.h

Index: stheader.h
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/stheader.h,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -r1.18 -r1.19
--- stheader.h	21 Oct 2001 15:47:31 -0000	1.18
+++ stheader.h	21 Oct 2001 16:31:19 -0000	1.19
@@ -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 @@
   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;