summaryrefslogtreecommitdiff
path: root/libavcodec/jpeg2000.h
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2015-06-28 02:31:26 +0200
committerMichael Niedermayer <michaelni@gmx.at>2015-06-28 02:31:26 +0200
commitcd1a9908b5def9df3692e92ded565e233fed6054 (patch)
tree919e407c0b6cbfb11c8801f0b6bd15c0aaae6792 /libavcodec/jpeg2000.h
parentf01028bf58b89a80132bda409167e39779de8835 (diff)
avcodec/jpeg2000: support >32bit in ff_jpeg2000_ceildivpow2()
Fixes part of Ticket4680 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/jpeg2000.h')
-rw-r--r--libavcodec/jpeg2000.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h
index a99c210bc8..541ea5c8f4 100644
--- a/libavcodec/jpeg2000.h
+++ b/libavcodec/jpeg2000.h
@@ -215,7 +215,7 @@ typedef struct Jpeg2000Component {
/* misc tools */
static inline int ff_jpeg2000_ceildivpow2(int a, int b)
{
- return -((-a) >> b);
+ return -(((int64_t)(-a)) >> b);
}
static inline int ff_jpeg2000_ceildiv(int a, int b)