mirror of https://git.ffmpeg.org/ffmpeg.git
avcodec/mjpegdec: Fix indention of ljpeg_decode_yuv_scan()
Reviewed-by: Paul B Mahol <onemda@gmail.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
(cherry picked from commit ea30ac1e40
)
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
parent
e02f55a3c5
commit
bd9525b4bf
|
@ -1201,25 +1201,25 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor,
|
||||||
|| v * mb_y + y >= s->height) {
|
|| v * mb_y + y >= s->height) {
|
||||||
// Nothing to do
|
// Nothing to do
|
||||||
} else if (bits<=8) {
|
} 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){
|
||||||
pred= 1 << (bits - 1);
|
pred= 1 << (bits - 1);
|
||||||
|
}else{
|
||||||
|
pred= ptr[-1];
|
||||||
|
}
|
||||||
}else{
|
}else{
|
||||||
pred= ptr[-1];
|
if(x==0 && leftcol){
|
||||||
|
pred= ptr[-linesize];
|
||||||
|
}else{
|
||||||
|
PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
}else{
|
|
||||||
if(x==0 && leftcol){
|
|
||||||
pred= ptr[-linesize];
|
|
||||||
}else{
|
|
||||||
PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
if (s->interlaced && s->bottom_field)
|
if (s->interlaced && s->bottom_field)
|
||||||
ptr += linesize >> 1;
|
ptr += linesize >> 1;
|
||||||
pred &= mask;
|
pred &= mask;
|
||||||
*ptr= pred + ((unsigned)dc << point_transform);
|
*ptr= pred + ((unsigned)dc << point_transform);
|
||||||
}else{
|
}else{
|
||||||
ptr16 = (uint16_t*)(s->picture_ptr->data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap
|
ptr16 = (uint16_t*)(s->picture_ptr->data[c] + 2*(linesize * (v * mb_y + y)) + 2*(h * mb_x + x)); //FIXME optimize this crap
|
||||||
if(y==0 && toprow){
|
if(y==0 && toprow){
|
||||||
|
|
Loading…
Reference in New Issue