diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2009-01-17 16:01:53 +0000 |
| commit | 896d352d7c65545d648805885d54f7b10c17329c (patch) | |
| tree | 53411bc9808f67ffe9fad2590a1f77103c0eb010 /src/demuxers | |
| parent | e80b58148fe11ba0770e6e2927faca06d6408574 (diff) | |
| parent | e886af1e544dc7db4abad76bdb14fe53a5467ced (diff) | |
| download | xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.gz xine-lib-896d352d7c65545d648805885d54f7b10c17329c.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libfaad/Makefile.am => contrib/libfaad/Makefile.am
rename : src/libxineadec/Makefile.am => src/audio_dec/Makefile.am
rename : src/libxinevdec/Makefile.am => src/video_dec/Makefile.am
rename : src/libxinevdec/image.c => src/video_dec/image.c
rename : src/libmpeg2/Makefile.am => src/video_dec/libmpeg2/Makefile.am
rename : src/libmpeg2new/Makefile.am => src/video_dec/libmpeg2new/Makefile.am
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/Makefile.am | 1 | ||||
| -rw-r--r-- | src/demuxers/demux_matroska.c | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/src/demuxers/Makefile.am b/src/demuxers/Makefile.am index 2d9320267..9fda6adfa 100644 --- a/src/demuxers/Makefile.am +++ b/src/demuxers/Makefile.am @@ -1,3 +1,4 @@ +include $(top_builddir)/misc/Makefile.plugins include $(top_srcdir)/misc/Makefile.common AM_CFLAGS = $(DEFAULT_OCFLAGS) $(VISIBILITY_FLAG) diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 92776f973..bdc30df30 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -1853,7 +1853,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size, uint8_t *data; uint8_t flags; int gap, lacing, num_len; - int timecode_diff; + int16_t timecode_diff; int64_t pts, xduration; int decoder_flags = 0; @@ -1863,7 +1863,7 @@ static int parse_block (demux_matroska_t *this, size_t block_size, data += num_len; /* timecode_diff is signed */ - timecode_diff = parse_int16(data); + timecode_diff = (int16_t)parse_int16(data); data += 2; flags = *data; |