From 9a18395b92f021938e1db29100f6c8ca690d3ab7 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michaelni@gmx.at>
Date: Mon, 27 May 2013 16:10:36 +0200
Subject: [PATCH] j2k/jpeg2000: merge a few whitespaces

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
---
 libavcodec/j2k.c      | 15 ++++++++-------
 libavcodec/jpeg2000.c |  2 +-
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/libavcodec/j2k.c b/libavcodec/j2k.c
index 443259b40d..1409f1f24c 100644
--- a/libavcodec/j2k.c
+++ b/libavcodec/j2k.c
@@ -431,14 +431,15 @@ void ff_j2k_cleanup(Jpeg2000Component *comp, Jpeg2000CodingStyle *codsty)
 
         for (bandno = 0; bandno < reslevel->nbands; bandno++) {
             Jpeg2000Band *band = reslevel->band + bandno;
-                for (precno = 0; precno < reslevel->num_precincts_x * reslevel->num_precincts_y; precno++) {
-                    Jpeg2000Prec *prec = band->prec + precno;
-                    av_freep(&prec->zerobits);
-                    av_freep(&prec->cblkincl);
-                    av_freep(&prec->cblk);
-                }
-                av_freep(&band->prec);
+            for (precno = 0; precno < reslevel->num_precincts_x * reslevel->num_precincts_y; precno++) {
+                Jpeg2000Prec *prec = band->prec + precno;
+                av_freep(&prec->zerobits);
+                av_freep(&prec->cblkincl);
+                av_freep(&prec->cblk);
             }
+
+            av_freep(&band->prec);
+        }
         av_freep(&reslevel->band);
     }
 
diff --git a/libavcodec/jpeg2000.c b/libavcodec/jpeg2000.c
index 0acc200a9d..988adeba5f 100644
--- a/libavcodec/jpeg2000.c
+++ b/libavcodec/jpeg2000.c
@@ -109,7 +109,7 @@ static int getsigctxno(int flag, int bandno)
         if (v == 1) return 3;
         if (d >= 2) return 2;
         if (d == 1) return 1;
-    } else{
+    } else {
         if (d >= 3) return 8;
         if (d == 2) {
             if (h+v >= 1) return 7;