[Bf-blender-cvs] [2175302] master: Possible fix for T38644: H.264 with PNG RGBA encoding crashes

[Sergey Sharybin]

Commit: 2175302d3bd0dba65870560513c0ef22d875a937
Author: Sergey Sharybin
Date:   Tue Feb 18 12:37:21 2014 +0600
https://developer.blender.org/rB2175302d3bd0dba65870560513c0ef22d875a937

Possible fix for T38644: H.264 with PNG RGBA encoding crashes

===================================================================

M	source/blender/blenkernel/intern/writeffmpeg.c

===================================================================

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index f2859dd..3ddbb9e 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -606,7 +606,7 @@ static AVStream *alloc_video_stream(RenderData *rd, int codec_id, AVFormatContex
 
 	if (codec_id == AV_CODEC_ID_PNG) {
 		if (rd->im_format.planes == R_IMF_PLANES_RGBA) {
-			c->pix_fmt = PIX_FMT_ARGB;
+			c->pix_fmt = PIX_FMT_RGBA;
 		}
 	}