From 86c30e327e1eb8ba913d74d5394ea90a87b55a69 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tomas=20H=C3=A4rdin?= <[email protected]>
Date: Fri, 10 Jun 2022 14:12:11 +0200
Subject: [PATCH 02/13] lavc/jpeg2000dec: Reindent
---
libavcodec/jpeg2000dec.c | 36 ++++++++++++++++++------------------
1 file changed, 18 insertions(+), 18 deletions(-)
diff --git a/libavcodec/jpeg2000dec.c b/libavcodec/jpeg2000dec.c
index d9754fc50e..9d3d406870 100644
--- a/libavcodec/jpeg2000dec.c
+++ b/libavcodec/jpeg2000dec.c
@@ -1969,26 +1969,26 @@ static int jpeg2000_decode_cb(AVCodecContext *avctx, void *td,
t1.stride = (1<<codsty->log2_cblk_width) + 2;
cb->coded = 0;
- ret = decode_cblk(s, codsty, &t1, cblk,
- cblk->coord[0][1] - cblk->coord[0][0],
- cblk->coord[1][1] - cblk->coord[1][0],
- bandpos, comp->roi_shift);
- if (ret)
- cb->coded = 1;
- else
- return 0;
+ ret = decode_cblk(s, codsty, &t1, cblk,
+ cblk->coord[0][1] - cblk->coord[0][0],
+ cblk->coord[1][1] - cblk->coord[1][0],
+ bandpos, comp->roi_shift);
+ if (ret)
+ cb->coded = 1;
+ else
+ return 0;
- x = cblk->coord[0][0] - band->coord[0][0];
- y = cblk->coord[1][0] - band->coord[1][0];
+ x = cblk->coord[0][0] - band->coord[0][0];
+ y = cblk->coord[1][0] - band->coord[1][0];
- if (comp->roi_shift)
- roi_scale_cblk(cblk, comp, &t1);
- if (codsty->transform == FF_DWT97)
- dequantization_float(x, y, cblk, comp, &t1, band);
- else if (codsty->transform == FF_DWT97_INT)
- dequantization_int_97(x, y, cblk, comp, &t1, band);
- else
- dequantization_int(x, y, cblk, comp, &t1, band);
+ if (comp->roi_shift)
+ roi_scale_cblk(cblk, comp, &t1);
+ if (codsty->transform == FF_DWT97)
+ dequantization_float(x, y, cblk, comp, &t1, band);
+ else if (codsty->transform == FF_DWT97_INT)
+ dequantization_int_97(x, y, cblk, comp, &t1, band);
+ else
+ dequantization_int(x, y, cblk, comp, &t1, band);
return 0;
}
--
2.30.2
_______________________________________________
ffmpeg-devel mailing list
[email protected]
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
[email protected] with subject "unsubscribe".
