[MPlayer-cvslog] r31531 - trunk/libmpdemux/demux_real.c

[diego]

Author: diego
Date: Wed Jun 23 12:59:26 2010
New Revision: 31531

Log:
Remove duplicated MKTAG macro definition, #include libavutil/common.h instead.

Modified:
   trunk/libmpdemux/demux_real.c

Modified: trunk/libmpdemux/demux_real.c
==============================================================================
--- trunk/libmpdemux/demux_real.c	Wed Jun 23 12:50:55 2010	(r31530)
+++ trunk/libmpdemux/demux_real.c	Wed Jun 23 12:59:26 2010	(r31531)
@@ -43,7 +43,7 @@
 #include "mp_msg.h"
 #include "help_mp.h"
 #include "mpbswap.h"
-
+#include "libavutil/common.h"
 #include "stream/stream.h"
 #include "aviprint.h"
 #include "demuxer.h"
@@ -52,8 +52,6 @@
 
 //#define mp_dbg(mod,lev, args... ) mp_msg_c((mod<<8)|lev, ## args )
 
-#define MKTAG(a, b, c, d) (a | (b << 8) | (c << 16) | (d << 24))
-
 #define MAX_STREAMS 32
 
 static unsigned char sipr_swaps[38][2]={