Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergey Sharybin <sergey.vfx@gmail.com>2014-02-18 10:37:21 +0400
committerSergey Sharybin <sergey.vfx@gmail.com>2014-02-18 10:37:21 +0400
commit2175302d3bd0dba65870560513c0ef22d875a937 (patch)
tree3dea5a09750d19afc74b534fd7632977bb43bbe0 /source/blender/blenkernel/intern/writeffmpeg.c
parent97b90d89f4744f40241daf19952493bb3d267cca (diff)
Possible fix for T38644: H.264 with PNG RGBA encoding crashes
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index f2859dd3421..3ddbb9e45c4 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;
}
}