summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-13 21:04:34 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2005-01-13 21:04:34 +0000
commit60e7dabb30fc3e21f213214055b9274bcefdbf21 (patch)
treed63586bb627ad84d44c42b66d728e3e663373c14 /libmpdemux
parent884635915566affab252f1799be43fd99de292ea (diff)
downloadmpv-60e7dabb30fc3e21f213214055b9274bcefdbf21.tar.bz2
mpv-60e7dabb30fc3e21f213214055b9274bcefdbf21.tar.xz
Do not access word-sized elements on potentially unaligned memory addresses. RISC processors usually do not like that.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@14490 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mkv.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c
index d238eb3bb8..81fde570ac 100644
--- a/libmpdemux/demux_mkv.c
+++ b/libmpdemux/demux_mkv.c
@@ -2900,7 +2900,7 @@ handle_block (demuxer_t *demuxer, uint8_t *block, uint64_t length,
num = ebml_read_vlen_uint (block, &tmp);
block += tmp;
/* time (relative to cluster time) */
- time = be2me_16 (* (int16_t *) block);
+ time = block[0] << 8 | block[1];
block += 2;
length -= tmp + 2;
old_length = length;