diff options
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer.h | 19 | ||||
| -rw-r--r-- | src/xine-engine/buffer_types.c | 14 |
2 files changed, 26 insertions, 7 deletions
diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h index 0e1921ace..e893a41ff 100644 --- a/src/xine-engine/buffer.h +++ b/src/xine-engine/buffer.h @@ -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: buffer.h,v 1.45 2002/06/02 16:32:46 tmmm Exp $ + * $Id: buffer.h,v 1.46 2002/06/03 13:31:12 miguelfreitas Exp $ * * * contents: @@ -258,6 +258,23 @@ uint32_t formattag_to_buf_audio( uint32_t formattag ); /* return codec name given BUF_VIDEO_xxx */ char * buf_audio_name( uint32_t buf_type ); + +/* this version of BITMAPINFOHEADER should be safe to compile on 64bits machines */ +typedef struct { + int32_t biSize; + int32_t biWidth; + int32_t biHeight; + int16_t biPlanes; + int16_t biBitCount; + int32_t biCompression; + int32_t biSizeImage; + int32_t biXPelsPerMeter; + int32_t biYPelsPerMeter; + int32_t biClrUsed; + int32_t biClrImportant; +} xine_bmiheader; + + #ifdef __cplusplus } #endif diff --git a/src/xine-engine/buffer_types.c b/src/xine-engine/buffer_types.c index 98e9dfb99..f487d64fc 100644 --- a/src/xine-engine/buffer_types.c +++ b/src/xine-engine/buffer_types.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: buffer_types.c,v 1.18 2002/06/02 16:32:46 tmmm Exp $ + * $Id: buffer_types.c,v 1.19 2002/06/03 13:31:13 miguelfreitas Exp $ * * * contents: @@ -37,11 +37,13 @@ #include <inttypes.h> #include "buffer.h" -#define WINE_TYPEDEFS_ONLY -#include "libw32dll/wine/avifmt.h" -#include "libw32dll/wine/windef.h" -#include "libw32dll/wine/vfw.h" -#include "libw32dll/wine/mmreg.h" + +#ifndef mmioFOURCC +#define mmioFOURCC( ch0, ch1, ch2, ch3 ) \ + ( (long)(unsigned char)(ch0) | ( (long)(unsigned char)(ch1) << 8 ) | \ + ( (long)(unsigned char)(ch2) << 16 ) | ( (long)(unsigned char)(ch3) << 24 ) ) +#endif + typedef struct video_db_s { uint32_t fourcc[20]; |