[MPlayer-cvslog] r35952 - in trunk/libmpdemux: aviheader.h muxer_avi.c

[reimar]

Author: reimar
Date: Sun Mar 10 19:07:20 2013
New Revision: 35952

Log:
Remove pointless defines that cause redefinition warnings
when compiling for Windows.

Modified:
   trunk/libmpdemux/aviheader.h
   trunk/libmpdemux/muxer_avi.c

Modified: trunk/libmpdemux/aviheader.h
==============================================================================
--- trunk/libmpdemux/aviheader.h	Sun Mar 10 18:52:52 2013	(r35951)
+++ trunk/libmpdemux/aviheader.h	Sun Mar 10 19:07:20 2013	(r35952)
@@ -129,9 +129,6 @@ typedef struct {
 #define AVIIF_NOTIME	    0x00000100L // this frame doesn't take any time
 #define AVIIF_COMPUSE       0x0FFF0000L // these bits are for compressor use
 
-#define FOURCC_RIFF     mmioFOURCC('R', 'I', 'F', 'F')
-#define FOURCC_LIST     mmioFOURCC('L', 'I', 'S', 'T')
-
 typedef struct
 {
     uint32_t		ckid;

Modified: trunk/libmpdemux/muxer_avi.c
==============================================================================
--- trunk/libmpdemux/muxer_avi.c	Sun Mar 10 18:52:52 2013	(r35951)
+++ trunk/libmpdemux/muxer_avi.c	Sun Mar 10 19:07:20 2013	(r35952)
@@ -170,7 +170,7 @@ if(len>0){
 
 static void write_avi_list(stream_t *stream, unsigned int id, int len)
 {
-  unsigned int list_id = FOURCC_LIST;
+  unsigned int list_id = mmioFOURCC('L', 'I', 'S', 'T');
   int le_len;
   int le_id;
   len += 4; // list fix