summaryrefslogtreecommitdiffstats
path: root/demux/ebml.c
diff options
context:
space:
mode:
authorMartin Herkt <lachs0r@srsfckn.biz>2017-02-12 01:01:56 +0100
committerMartin Herkt <lachs0r@srsfckn.biz>2017-02-12 01:01:56 +0100
commit35aa705c3ece8293652ffcf449c71fe80b96e722 (patch)
tree7c0fb34ec96204cbcd867a973b2476689919a5b4 /demux/ebml.c
parent10a005df0c981050afc35184a42173bea7ea2527 (diff)
parent3739d1318fdb658bb6037bfe06bb6cefb3b50a09 (diff)
downloadmpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.bz2
mpv-35aa705c3ece8293652ffcf449c71fe80b96e722.tar.xz
Merge branch 'master' into release/current
Diffstat (limited to 'demux/ebml.c')
-rw-r--r--demux/ebml.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/ebml.c b/demux/ebml.c
index abbb73cfac..d62dd40593 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -120,7 +120,7 @@ int64_t ebml_read_vlen_int(bstr *buffer)
return EBML_INT_INVALID;
l = len - buffer->len;
- return unum - ((1 << ((7 * l) - 1)) - 1);
+ return unum - ((1LL << ((7 * l) - 1)) - 1);
}
/*