Merge commit '589e5b52f634f6b2d307a167a19eef7e7328cb08'
[ffmpeg.git] / libavcodec / jpeg2000dec.c
index f45e609c200d4cf8e2eb3a37e4603e72e64a19e6..711b298d3fe7a15dc2c47d1d77caaa9b5e562422 100644 (file)
@@ -242,7 +242,7 @@ static int get_siz(Jpeg2000DecoderContext *s)
     s->avctx->height = ff_jpeg2000_ceildivpow2(s->height - s->image_offset_y,
                                                s->reduction_factor);
 
-    switch(s->ncomponents) {
+    switch (s->ncomponents) {
     case 1:
         if (s->precision > 8)
             s->avctx->pix_fmt = AV_PIX_FMT_GRAY16;
@@ -940,8 +940,8 @@ static int decode_cblk(Jpeg2000DecoderContext *s, Jpeg2000CodingStyle *codsty,
     if (!cblk->length)
         return 0;
 
-    for (y = 0; y < height+2; y++)
-        memset(t1->flags[y], 0, (width + 2)*sizeof(**t1->flags));
+    for (y = 0; y < height + 2; y++)
+        memset(t1->flags[y], 0, (width + 2) * sizeof(**t1->flags));
 
     cblk->data[cblk->length] = 0xff;
     cblk->data[cblk->length+1] = 0xff;