[FFmpeg-cvslog] proresdec2: Only try to decode alpha plane if four output planes were allocated.
Carl Eugen Hoyos
git at videolan.org
Sun May 19 02:00:16 CEST 2013
ffmpeg | branch: master | Carl Eugen Hoyos <cehoyos at ag.or.at> | Sun May 19 01:48:39 2013 +0200| [e32bbd411242658717b0dd637dd85da4c8b40437] | committer: Carl Eugen Hoyos
proresdec2: Only try to decode alpha plane if four output planes were allocated.
Fixes a crash with MPlayer.
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=e32bbd411242658717b0dd637dd85da4c8b40437
---
libavcodec/proresdec2.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavcodec/proresdec2.c b/libavcodec/proresdec2.c
index 3073880..374c5cb 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);
More information about the ffmpeg-cvslog
mailing list