diff options
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; |