Mercurial > mplayer.hg
changeset 2341:62be13447906
oggvorbis stuff moved out from stheader.h
| author | arpi |
|---|---|
| date | Sun, 21 Oct 2001 16:31:19 +0000 |
| parents | 8d060befd639 |
| children | c8caaf8cd683 |
| files | dec_audio.c libmpdemux/stheader.h |
| diffstat | 2 files changed, 15 insertions(+), 23 deletions(-) [+] |
line wrap: on
line diff
--- a/dec_audio.c Sun Oct 21 16:14:10 2001 +0000 +++ b/dec_audio.c Sun Oct 21 16:31:19 2001 +0000 @@ -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
--- a/libmpdemux/stheader.h Sun Oct 21 16:14:10 2001 +0000 +++ b/libmpdemux/stheader.h Sun Oct 21 16:31:19 2001 +0000 @@ -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;