summaryrefslogtreecommitdiff
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-10-22 02:28:54 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-10-22 02:28:54 +0200
commitc5ffd7aee5a6d60b29721046f94507dcaaae966c (patch)
treecfd66a6b517556804b4e6a52486b9567c5ed9dcc /libavcodec
parentb6e8f10bcbf29a0395fba2a4f60343f605bc5c31 (diff)
avcodec/mjpegdec: use FF_CEIL_RSHIFT() for width
No testcase known Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 17421dd8b0..cdb75afbcb 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))