From b132d09580a85907e52a52624bd8d2a90da9629d Mon Sep 17 00:00:00 2001
From: Alexandre Janniaux <ajanni@videolabs.io>
Date: Wed, 11 Sep 2024 16:11:54 +0200
Subject: [PATCH] vpx_alpha: reindent after last changes
---
modules/codec/vpx_alpha.c | 40 ++++++++++++++++++---------------------
1 file changed, 18 insertions(+), 22 deletions(-)
diff --git a/modules/codec/vpx_alpha.c b/modules/codec/vpx_alpha.c
index d857e9a01528..7da8888afc34 100644
--- a/modules/codec/vpx_alpha.c
+++ b/modules/codec/vpx_alpha.c
@@ -135,34 +135,30 @@ static picture_t *CombinePicturesCPU(decoder_t *bdec, picture_t *opaque, picture
return out;
}
+ // use the dummy opaque plane attached in the picture context
+ struct pic_alpha_plane *p = alpha_ctx->plane;
+ if (p == NULL)
{
- // use the dummy opaque plane attached in the picture context
- struct pic_alpha_plane *p = alpha_ctx->plane;
- if (p == NULL)
+ int plane_size = bdec->fmt_out.video.i_width * bdec->fmt_out.video.i_height;
+ p = malloc(sizeof(*p) + plane_size);
+ if (unlikely(p == NULL))
{
- int plane_size = bdec->fmt_out.video.i_width * bdec->fmt_out.video.i_height;
- p = malloc(sizeof(*p) + plane_size);
- if (unlikely(p == NULL))
- {
- picture_Release(out);
- return NULL;
- }
+ picture_Release(out);
+ return NULL;
+ }
- {
- p->p.i_lines = bdec->fmt_out.video.i_height;
- p->p.i_visible_lines = bdec->fmt_out.video.i_y_offset + bdec->fmt_out.video.i_visible_height;
+ p->p.i_lines = bdec->fmt_out.video.i_height;
+ p->p.i_visible_lines = bdec->fmt_out.video.i_y_offset + bdec->fmt_out.video.i_visible_height;
- p->p.i_pitch = bdec->fmt_out.video.i_width;
- p->p.i_visible_pitch = bdec->fmt_out.video.i_x_offset + bdec->fmt_out.video.i_visible_width;
- p->p.i_pixel_pitch = 1;
- p->p.p_pixels = p->buffer;
- memset(p->p.p_pixels, 0xFF, plane_size);
+ p->p.i_pitch = bdec->fmt_out.video.i_width;
+ p->p.i_visible_pitch = bdec->fmt_out.video.i_x_offset + bdec->fmt_out.video.i_visible_width;
+ p->p.i_pixel_pitch = 1;
+ p->p.p_pixels = p->buffer;
+ memset(p->p.p_pixels, 0xFF, plane_size);
- alpha_ctx->plane = p;
- }
- }
- out->p[opaque->i_planes] = p->p;
+ alpha_ctx->plane = p;
}
+ out->p[opaque->i_planes] = p->p;
return out;
}
--
GitLab