From e32bbd411242658717b0dd637dd85da4c8b40437 Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Sun, 19 May 2013 01:48:39 +0200 Subject: [PATCH] proresdec2: Only try to decode alpha plane if four output planes were allocated. Fixes a crash with MPlayer. --- libavcodec/proresdec2.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c index 3073880ac2..374c5cb8ad 100644 --- a/libavcodec/proresdec2.c +++ b/libavcodec/proresdec2.c @@ -591,7 +591,7 @@ static int decode_slice_thread(AVCodecContext *avctx, void *arg, int jobnr, int qmat_chroma_scaled, log2_chroma_blocks_per_mb); } /* decode alpha plane if available */ - if (ctx->alpha_info && dest_a && a_data_size) + if (ctx->alpha_info && pic->data[3] && a_data_size) decode_slice_alpha(ctx, (uint16_t*)dest_a, luma_stride, buf + y_data_size + u_data_size + v_data_size, a_data_size, slice->mb_count);