[Mplayer-cvslog] CVS: main dec_audio.c,1.41,1.42

[Arpi of Ize]

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

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

Index: dec_audio.c
===================================================================
RCS file: /cvsroot/mplayer/main/dec_audio.c,v
retrieving revision 1.41
retrieving revision 1.42
diff -u -r1.41 -r1.42
--- dec_audio.c	2 Oct 2001 21:44:45 -0000	1.41
+++ dec_audio.c	21 Oct 2001 16:30:59 -0000	1.42
@@ -18,10 +18,6 @@
 #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 @@
 /* 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