diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-06-03 13:31:12 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-06-03 13:31:12 +0000 |
| commit | cda65678b224164074a7b8bf478f708f65d79b01 (patch) | |
| tree | f675b1cb69ec7ea3301d9cba2232d4bbf9545d0b /src/demuxers/demux_ogg.c | |
| parent | 16dc3c94e7ac4b83c9989e7cf4db39f46c221de3 (diff) | |
| download | xine-lib-cda65678b224164074a7b8bf478f708f65d79b01.tar.gz xine-lib-cda65678b224164074a7b8bf478f708f65d79b01.tar.bz2 | |
BITMAPINFOHEADER -> xine_bmiheader (now compatible with 64bit systems)
remove some dependencies on wine headers
CVS patchset: 1995
CVS date: 2002/06/03 13:31:12
Diffstat (limited to 'src/demuxers/demux_ogg.c')
| -rw-r--r-- | src/demuxers/demux_ogg.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/src/demuxers/demux_ogg.c b/src/demuxers/demux_ogg.c index 8a9d66852..0d58126a3 100644 --- a/src/demuxers/demux_ogg.c +++ b/src/demuxers/demux_ogg.c @@ -17,7 +17,7 @@ * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA * - * $Id: demux_ogg.c,v 1.26 2002/05/25 19:19:17 siggi Exp $ + * $Id: demux_ogg.c,v 1.27 2002/06/03 13:31:13 miguelfreitas Exp $ * * demultiplexer for ogg streams * @@ -36,11 +36,6 @@ #include <ogg/ogg.h> -#define WINE_TYPEDEFS_ONLY -#include "libw32dll/wine/avifmt.h" -#include "libw32dll/wine/windef.h" -#include "libw32dll/wine/vfw.h" - #include "xine_internal.h" #include "xineutils.h" #include "demux.h" @@ -228,7 +223,7 @@ static void demux_ogg_send_package (demux_ogg_t *this) { dsogg_header_t *oggh; buf_element_t *buf; - BITMAPINFOHEADER bih; + xine_bmiheader bih; #ifdef LOG printf ("demux_ogg: direct show filter created stream detected, hexdump:\n"); @@ -251,7 +246,7 @@ static void demux_ogg_send_package (demux_ogg_t *this) { printf ("demux_ogg: buf_type %08x\n",this->buf_types[stream_num]); #endif - bih.biSize=sizeof(BITMAPINFOHEADER); + bih.biSize=sizeof(xine_bmiheader); bih.biWidth = oggh->hubba.video.width; bih.biHeight= oggh->hubba.video.height; bih.biPlanes= 0; @@ -268,8 +263,8 @@ static void demux_ogg_send_package (demux_ogg_t *this) { buf->decoder_flags = BUF_FLAG_HEADER; this->frame_duration = oggh->time_unit * 9 / 1000; buf->decoder_info[1] = this->frame_duration; - memcpy (buf->content, &bih, sizeof (BITMAPINFOHEADER)); - buf->size = sizeof (BITMAPINFOHEADER); + memcpy (buf->content, &bih, sizeof (xine_bmiheader)); + buf->size = sizeof (xine_bmiheader); buf->type = this->buf_types[stream_num]; this->video_fifo->put (this->video_fifo, buf); |