aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <clement@stupeflix.com>2014-09-13 20:25:27 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-09-13 20:25:27 +0200
commitb96d864fd685aa1f661a5f8666224129d68b8eaf (patch)
treeb61b04b4439c17e04c0d5e7356d0c951c77a0455
parentceb2fe027fec2bf8f1847d8a9676630583031e65 (diff)
downloadffmpeg-b96d864fd685aa1f661a5f8666224129d68b8eaf.tar.gz
avcodec/mjpegdec: Fix chroma width rounding
Fixes vertical line at the right side Fixes Ticket 3929 Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavcodec/mjpegdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index 827c24de81..4d17c5ff31 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2127,7 +2127,7 @@ the_end:
if (!(s->upscale_v & (1<<p)))
continue;
if (p==1 || p==2)
- w >>= hshift;
+ w = FF_CEIL_RSHIFT(w, hshift);
for (i = s->height - 1; i; i--) {
uint8_t *src1 = &((uint8_t *)s->picture_ptr->data[p])[i / 2 * s->linesize[p]];
uint8_t *src2 = &((uint8_t *)s->picture_ptr->data[p])[(i + 1) / 2 * s->linesize[p]];