# HG changeset patch # User reimar # Date 1362938840 0 # Node ID 35404774428dfa4895dacac30e5b572116471da3 # Parent deb05212671e64b970ae157a3833cf97da1375a6 Remove pointless defines that cause redefinition warnings when compiling for Windows. diff -r deb05212671e -r 35404774428d libmpdemux/aviheader.h --- 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; diff -r deb05212671e -r 35404774428d libmpdemux/muxer_avi.c --- 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