Mercurial > mplayer.hg

changeset 35858:35404774428d

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless defines that cause redefinition warnings when compiling for Windows.
author reimar
date Sun, 10 Mar 2013 18:07:20 +0000
parents deb05212671e
children d67d5c8311fe
files libmpdemux/aviheader.h libmpdemux/muxer_avi.c
diffstat 2 files changed, 1 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/aviheader.h	Sun Mar 10 17:52:52 2013 +0000
+++ b/libmpdemux/aviheader.h	Sun Mar 10 18:07:20 2013 +0000
@@ -129,9 +129,6 @@
 #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;
--- a/libmpdemux/muxer_avi.c	Sun Mar 10 17:52:52 2013 +0000
+++ b/libmpdemux/muxer_avi.c	Sun Mar 10 18:07:20 2013 +0000
@@ -170,7 +170,7 @@
 
 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