From c5ffd7aee5a6d60b29721046f94507dcaaae966c Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Wed, 22 Oct 2014 02:28:54 +0200
Subject: [PATCH] avcodec/mjpegdec: use FF_CEIL_RSHIFT() for width
No testcase known
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
libavcodec/mjpegdec.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 17421dd8b06..cdb75afbcb2 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2101,7 +2101,7 @@ the_end:
if (!(s->upscale_h & (1<<p)))
continue;
if (p==1 || p==2) {
- w >>= hshift;
+ w = FF_CEIL_RSHIFT(w, hshift);
h = FF_CEIL_RSHIFT(h, vshift);
}
if (s->upscale_v & (1<<p))
--
GitLab