|
@@ -1093,7 +1093,10 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, |
|
|
dc = mjpeg_decode_dc(s, s->dc_index[i]); |
|
|
dc = mjpeg_decode_dc(s, s->dc_index[i]); |
|
|
if(dc == 0xFFFFF) |
|
|
if(dc == 0xFFFFF) |
|
|
return -1; |
|
|
return -1; |
|
|
if(bits<=8){ |
|
|
|
|
|
|
|
|
if ( h * mb_x + x >= s->width |
|
|
|
|
|
|| v * mb_y + y >= s->height) { |
|
|
|
|
|
// Nothing to do |
|
|
|
|
|
} else if (bits<=8) { |
|
|
ptr = s->picture_ptr->data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap |
|
|
ptr = s->picture_ptr->data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap |
|
|
if(y==0 && toprow){ |
|
|
if(y==0 && toprow){ |
|
|
if(x==0 && leftcol){ |
|
|
if(x==0 && leftcol){ |
|
@@ -1161,7 +1164,10 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor, |
|
|
dc = mjpeg_decode_dc(s, s->dc_index[i]); |
|
|
dc = mjpeg_decode_dc(s, s->dc_index[i]); |
|
|
if(dc == 0xFFFFF) |
|
|
if(dc == 0xFFFFF) |
|
|
return -1; |
|
|
return -1; |
|
|
if(bits<=8){ |
|
|
|
|
|
|
|
|
if ( h * mb_x + x >= s->width |
|
|
|
|
|
|| v * mb_y + y >= s->height) { |
|
|
|
|
|
// Nothing to do |
|
|
|
|
|
} else if (bits<=8) { |
|
|
ptr = s->picture_ptr->data[c] + |
|
|
ptr = s->picture_ptr->data[c] + |
|
|
(linesize * (v * mb_y + y)) + |
|
|
(linesize * (v * mb_y + y)) + |
|
|
(h * mb_x + x); //FIXME optimize this crap |
|
|
(h * mb_x + x); //FIXME optimize this crap |
|
|