1
0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00

proresdec2: Only try to decode alpha plane if four output planes were allocated.

Fixes a crash with MPlayer.
This commit is contained in:
Carl Eugen Hoyos 2013-05-19 01:48:39 +02:00
parent c86d3a54de
commit e32bbd4112

View File

@ -591,7 +591,7 @@ static int decode_slice_thread(AVCodecContext *avctx, void *arg, int jobnr, int
qmat_chroma_scaled, log2_chroma_blocks_per_mb); qmat_chroma_scaled, log2_chroma_blocks_per_mb);
} }
/* decode alpha plane if available */ /* 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, decode_slice_alpha(ctx, (uint16_t*)dest_a, luma_stride,
buf + y_data_size + u_data_size + v_data_size, buf + y_data_size + u_data_size + v_data_size,
a_data_size, slice->mb_count); a_data_size, slice->mb_count);