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, 2 insertions, 18 deletions

diff --git a/src/demuxers/demux_film.c b/src/demuxers/demux_film.c
index 46289f993..f025607af 100644
--- a/src/demuxers/demux_film.c
+++ b/src/demuxers/demux_film.c
@@ -21,7 +21,7 @@
  * For more information on the FILM file format, visit:
  *   http://www.pcisys.net/~melanson/codecs/
  *
- * $Id: demux_film.c,v 1.6 2002/05/28 17:50:15 miguelfreitas Exp $
+ * $Id: demux_film.c,v 1.7 2002/06/03 13:31:13 miguelfreitas Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -55,22 +55,6 @@
 
 #define VALID_ENDS   "cpk,cak,film"
 
-/* TODO: lobby the xine team to revise the API so that it's no longer
-   necessary to ship around this inane Win32-specific structure */
-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 {
   off_t sample_offset;
   unsigned int sample_size;
@@ -105,7 +89,7 @@ typedef struct {
   /* video information */
   unsigned int         video_codec;
   unsigned int         video_type;
-  BITMAPINFOHEADER     bih;
+  xine_bmiheader       bih;
 
   /* audio information */
   unsigned int         audio_type;