avcodec/mjpegdec: fix green line at the bottom with upscale v
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 31 Aug 2014 13:33:30 +0000 (15:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 3 Oct 2014 01:40:58 +0000 (03:40 +0200)
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit f0d4f00f24d41441ebd63694df57ab203a764aa5)

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/mjpegdec.c

index b839e58..ce2d9fd 100644 (file)
@@ -2130,7 +2130,7 @@ the_end:
             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]];
-                if (src1 == src2) {
+                if (src1 == src2 || i == s->height - 1) {
                     memcpy(dst, src1, w);
                 } else {
                     for (index = 0; index < w; index++)