[FFmpeg-cvslog] avcodec/jpeg2000: support >32bit in ff_jpeg2000_ceildivpow2()

Michael Niedermayer git at videolan.org
Sun Jun 28 02:57:29 CEST 2015


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jun 28 02:31:26 2015 +0200| [cd1a9908b5def9df3692e92ded565e233fed6054] | committer: Michael Niedermayer

avcodec/jpeg2000: support >32bit in ff_jpeg2000_ceildivpow2()

Fixes part of Ticket4680

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=cd1a9908b5def9df3692e92ded565e233fed6054
---

 libavcodec/jpeg2000.h |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavcodec/jpeg2000.h b/libavcodec/jpeg2000.h
index a99c210..541ea5c 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)



More information about the ffmpeg-cvslog mailing list