ffmpeg | branch: release/2.3 | Michael Niedermayer <michae...@gmx.at> | Sun Aug 31 15:33:30 2014 +0200| [f903147f2d170edcb1740fefce944f52a684d3ae] | committer: Michael Niedermayer
avcodec/mjpegdec: fix green line at the bottom with upscale v Signed-off-by: Michael Niedermayer <michae...@gmx.at> (cherry picked from commit f0d4f00f24d41441ebd63694df57ab203a764aa5) Signed-off-by: Michael Niedermayer <michae...@gmx.at> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=f903147f2d170edcb1740fefce944f52a684d3ae --- libavcodec/mjpegdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c index b839e58..ce2d9fd 100644 --- a/libavcodec/mjpegdec.c +++ b/libavcodec/mjpegdec.c @@ -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++) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
