summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authornicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-20 20:48:55 +0000
committernicodvb <nicodvb@b3059339-0415-0410-9bf9-f77b7e298cf2>2006-04-20 20:48:55 +0000
commita160c8687fb0dde65f5dc4693940e1aff09694cf (patch)
tree203ccd99285bff019e42a2ff9afc959c24cebf99 /libmpdemux
parentaa0de16882c5f5b575c16c40d9e0206b98c09f4c (diff)
downloadmpv-a160c8687fb0dde65f5dc4693940e1aff09694cf.tar.bz2
mpv-a160c8687fb0dde65f5dc4693940e1aff09694cf.tar.xz
added support for DX50 and dx50 4CCs
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18165 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/muxer_mpeg.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libmpdemux/muxer_mpeg.c b/libmpdemux/muxer_mpeg.c
index 2b016b156f..3bb38585cd 100644
--- a/libmpdemux/muxer_mpeg.c
+++ b/libmpdemux/muxer_mpeg.c
@@ -247,7 +247,9 @@ static inline int is_mpeg4(uint32_t x)
(x == mmioFOURCC('m','p','4','v')) ||
(x == mmioFOURCC('M','P','4','V')) ||
(x == mmioFOURCC('F', 'M','P','4')) ||
- (x == mmioFOURCC('f', 'm','p','4'))
+ (x == mmioFOURCC('f', 'm','p','4')) ||
+ (x == mmioFOURCC('D', 'X','5','0')) ||
+ (x == mmioFOURCC('d', 'x','5','0'))
);
}