aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michael@niedermayer.cc>2018-12-18 14:27:48 +0100
committerMichael Niedermayer <michael@niedermayer.cc>2018-12-19 10:01:08 +0100
commitea30ac1e408246382796f61d645d1e087aed390a (patch)
treee3efafd62a481c5fadaef21e390df11d4b0ba040
parentdfb5046cf33b0cdb7d2b780d8d32e72b98a5914c (diff)
downloadffmpeg-ea30ac1e408246382796f61d645d1e087aed390a.tar.gz
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>
-rw-r--r--libavcodec/mjpegdec.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/libavcodec/mjpegdec.c b/libavcodec/mjpegdec.c
index d2dadb9bf1..902b8eb7cb 100644
--- a/libavcodec/mjpegdec.c
+++ b/libavcodec/mjpegdec.c
@@ -1221,25 +1221,25 @@ static int ljpeg_decode_yuv_scan(MJpegDecodeContext *s, int predictor,
|| 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
- if(y==0 && toprow){
- if(x==0 && leftcol){
- pred= 1 << (bits - 1);
- }else{
- pred= ptr[-1];
- }
- }else{
- if(x==0 && leftcol){
- pred= ptr[-linesize];
+ ptr = s->picture_ptr->data[c] + (linesize * (v * mb_y + y)) + (h * mb_x + x); //FIXME optimize this crap
+ if(y==0 && toprow){
+ if(x==0 && leftcol){
+ pred= 1 << (bits - 1);
+ }else{
+ pred= ptr[-1];
+ }
}else{
- PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
+ if(x==0 && leftcol){
+ pred= ptr[-linesize];
+ }else{
+ PREDICT(pred, ptr[-linesize-1], ptr[-linesize], ptr[-1], predictor);
+ }
}
- }
- if (s->interlaced && s->bottom_field)
- ptr += linesize >> 1;
- pred &= mask;
- *ptr= pred + ((unsigned)dc << point_transform);
+ if (s->interlaced && s->bottom_field)
+ ptr += linesize >> 1;
+ pred &= mask;
+ *ptr= pred + ((unsigned)dc << point_transform);
}else{
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){