diff options
author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-04 16:55:46 +0000 |
---|---|---|
committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-02-04 16:55:46 +0000 |
commit | e54c70158ace712ff1026d8ef133404b1941078a (patch) | |
tree | 79314aade64a71a6409a2c1f36207de3e5f52918 | |
parent | 15ed98032861393d23adf4076c704a0d85361895 (diff) | |
parent | dac76e08eaf7a876df7d251d613b4a175dbbe2ff (diff) | |
download | xine-lib-e54c70158ace712ff1026d8ef133404b1941078a.tar.gz xine-lib-e54c70158ace712ff1026d8ef133404b1941078a.tar.bz2 |
Merge.
-rw-r--r-- | src/demuxers/demux_matroska.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/demuxers/demux_matroska.c b/src/demuxers/demux_matroska.c index 4a99492ef..c4f678427 100644 --- a/src/demuxers/demux_matroska.c +++ b/src/demuxers/demux_matroska.c @@ -1842,7 +1842,7 @@ static int parse_block (demux_matroska_t *this, uint64_t block_size, int decoder_flags = 0; data = this->block_data; - if (!(num_len = parse_ebml_sint(this, data, &track_num))) + if (!(num_len = parse_ebml_uint(this, data, &track_num))) return 0; data += num_len; @@ -1974,7 +1974,7 @@ static int parse_block (demux_matroska_t *this, uint64_t block_size, lprintf("ebml lacing\n"); /* size of each frame */ - if (!(num_len = parse_ebml_sint(this, data, &tmp))) + if (!(num_len = parse_ebml_uint(this, data, &tmp))) return 0; data += num_len; block_size_left -= num_len; frame[0] = (int) tmp; |