summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2010-06-23 10:59:26 +0000
committerUoti Urpala <uau@glyph.nonexistent.invalid>2010-11-02 04:11:42 +0200
commit1ba2cadb839810eac138e6cf45d6aac7a0bd6c2e (patch)
tree94dd5eb8acb3d5f00fa2f7b344992076310c9649 /libmpdemux
parentfd7cf006b7bc26709e9784bfb97635e988d3f218 (diff)
downloadmpv-1ba2cadb839810eac138e6cf45d6aac7a0bd6c2e.tar.bz2
mpv-1ba2cadb839810eac138e6cf45d6aac7a0bd6c2e.tar.xz
demux_real: use MKTAG definition from libavutil
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@31531 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_real.c4
1 files changed, 1 insertions, 3 deletions
diff --git a/libmpdemux/demux_real.c b/libmpdemux/demux_real.c
index 99abb03827..4d95311726 100644
--- a/libmpdemux/demux_real.c
+++ b/libmpdemux/demux_real.c
@@ -42,7 +42,7 @@
#include "config.h"
#include "mp_msg.h"
#include "mpbswap.h"
-
+#include "libavutil/common.h"
#include "stream/stream.h"
#include "aviprint.h"
#include "demuxer.h"
@@ -51,8 +51,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]={