diff options
| author | Clément Bœsch <clement@stupeflix.com> | 2014-09-13 20:25:27 +0200 |
|---|---|---|
| committer | Carl Eugen Hoyos <cehoyos@ag.or.at> | 2014-11-01 15:51:41 +0100 |
| commit | 193b949f715edc81cedd0bf116b7060e20d6a112 (patch) | |
| tree | 0ab24eb59f193c19ec03fdde08fa017188ea87c4 | |
| parent | 63ed7e09dd1e4b6a0721f3d5f74b4819d53e103c (diff) | |
| download | ffmpeg-193b949f715edc81cedd0bf116b7060e20d6a112.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>
(cherry picked from commit b96d864fd685aa1f661a5f8666224129d68b8eaf)
| -rw-r--r-- | libavcodec/mjpegdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index 6a025272c2..b29b3405ed 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -2128,7 +2128,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]]; |