Mercurial > mplayer.hg

changeset 31465:65a4a8ddb552

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove duplicated MKTAG macro definition, #include libavutil/common.h instead.
author diego
date Wed, 23 Jun 2010 10:59:26 +0000
parents 1453fc56d49c
children 765facb4279f
files libmpdemux/demux_real.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_real.c	Wed Jun 23 10:50:55 2010 +0000
+++ b/libmpdemux/demux_real.c	Wed Jun 23 10:59:26 2010 +0000
@@ -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]={