generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

avcodec/mjpegdec: fix green vertical line at the right with upscale h

Browse Source 
Fixes Ticket3891

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-08-31 14:42:53 +02:00
parent 6d7aa437e1
commit 63a52ca134
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libavcodec/mjpegdec.c
View File

@ -2097,8 +2097,11 @@ the_end:
continue; continue;
if (p==1 || p==2) if (p==1 || p==2)
w >>= hshift; w >>= hshift;
av_assert0(w > 0);
for (i = 0; i < s->chroma_height; i++) { for (i = 0; i < s->chroma_height; i++) {
for (index = w - 1; index; index--) { if (is16bit) ((uint16_t*)line)[w - 1] = ((uint16_t*)line)[(w - 1) / 2];
else line[w - 1] = line[(w - 1) / 2];
for (index = w - 2; index > 0; index--) {
if (is16bit) if (is16bit)
((uint16_t*)line)[index] = (((uint16_t*)line)[index / 2] + ((uint16_t*)line)[(index + 1) / 2]) >> 1; ((uint16_t*)line)[index] = (((uint16_t*)line)[index / 2] + ((uint16_t*)line)[(index + 1) / 2]) >> 1;
else else