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

1 files changed, 3 insertions, 18 deletions

diff --git a/src/libxinevdec/msvc.c b/src/libxinevdec/msvc.c
index eddf34236..f072cd16d 100644
--- a/src/libxinevdec/msvc.c
+++ b/src/libxinevdec/msvc.c
@@ -22,7 +22,7 @@
  * based on overview of Microsoft Video-1 algorithm
  * by Mike Melanson: http://www.pcisys.net/~melanson/codecs/video1.txt
  *
- * $Id: msvc.c,v 1.3 2002/05/25 19:19:19 siggi Exp $
+ * $Id: msvc.c,v 1.4 2002/06/03 13:31:12 miguelfreitas Exp $
  */
 
 #include <stdlib.h>
@@ -36,21 +36,6 @@
 
 #define VIDEOBUFSIZE	128 * 1024
 
-/* now this is ripped of wine's vfw.h */
-typedef struct {
-    long        biSize;
-    long        biWidth;
-    long        biHeight;
-    short       biPlanes;
-    short       biBitCount;
-    long        biCompression;
-    long        biSizeImage;
-    long        biXPelsPerMeter;
-    long        biYPelsPerMeter;
-    long        biClrUsed;
-    long        biClrImportant;
-} BITMAPINFOHEADER;
-
 typedef struct {
   uint16_t yu;
   uint16_t yv;
@@ -222,9 +207,9 @@ static void msvc_decode_data (video_decoder_t *this_gen, buf_element_t *buf) {
     return;
 
   if (buf->decoder_flags & BUF_FLAG_HEADER) {
-    BITMAPINFOHEADER *bih;
+    xine_bmiheader *bih;
 
-    bih = (BITMAPINFOHEADER *) buf->content;
+    bih = (xine_bmiheader *) buf->content;
     this->biWidth = (le2me_32 (bih->biWidth) + 3) & ~0x03;
     this->biHeight = (le2me_32 (bih->biHeight) + 3) & ~0x03;
     this->biBitCount = le2me_32 (bih->biBitCount);