aboutsummaryrefslogtreecommitdiffstats
path: root/libavcodec
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-31 15:33:30 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-31 15:33:30 +0200
commitf0d4f00f24d41441ebd63694df57ab203a764aa5 (patch)
tree0006f3c9303fddc409dce57e0173bcea5bd129be /libavcodec
parent63a52ca134dc4ee648a547c7c410d547f371b481 (diff)
downloadffmpeg-f0d4f00f24d41441ebd63694df57ab203a764aa5.tar.gz
avcodec/mjpegdec: fix green line at the bottom with upscale v
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 ac898bb432..c3a3b86e4e 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -2131,7 +2131,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++)