[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [55219] trunk/blender/source/blender: Patch #34569: Enable PNG Codec for video output

Sergey Sharybin sergey.vfx at gmail.com
Tue Mar 12 17:09:23 CET 2013


Revision: 55219
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=55219
Author:   nazgul
Date:     2013-03-12 16:09:23 +0000 (Tue, 12 Mar 2013)
Log Message:
-----------
Patch #34569: Enable PNG Codec for video output

By Gottfried Hofmann, thanks!

Modified Paths:
--------------
    trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
    trunk/blender/source/blender/makesrna/intern/rna_scene.c

Modified: trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
--- trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-03-12 14:55:52 UTC (rev 55218)
+++ trunk/blender/source/blender/blenkernel/intern/writeffmpeg.c	2013-03-12 16:09:23 UTC (rev 55219)
@@ -551,6 +551,12 @@
 		}
 	}
 
+	if (codec_id == CODEC_ID_PNG) {
+		if (rd->im_format.planes == R_IMF_PLANES_RGBA) {
+			c->pix_fmt = PIX_FMT_ARGB;
+		}
+	}
+
 	if ((of->oformat->flags & AVFMT_GLOBALHEADER)
 //		|| !strcmp(of->oformat->name, "mp4")
 //	    || !strcmp(of->oformat->name, "mov")
@@ -1493,6 +1499,9 @@
 	if (codec == CODEC_ID_QTRLE)
 		return TRUE;
 
+	if (codec == CODEC_ID_PNG)
+		return TRUE;
+
 #ifdef FFMPEG_FFV1_ALPHA_SUPPORTED
 	if (codec == CODEC_ID_FFV1)
 		return TRUE;

Modified: trunk/blender/source/blender/makesrna/intern/rna_scene.c
===================================================================
--- trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-03-12 14:55:52 UTC (rev 55218)
+++ trunk/blender/source/blender/makesrna/intern/rna_scene.c	2013-03-12 16:09:23 UTC (rev 55219)
@@ -3089,8 +3089,9 @@
 		{CODEC_ID_THEORA, "THEORA", 0, "Theora", ""},
 		{CODEC_ID_FLV1, "FLASH", 0, "Flash Video", ""},
 		{CODEC_ID_FFV1, "FFV1", 0, "FFmpeg video codec #1", ""},
-		{CODEC_ID_QTRLE, "QTRLE", 0, "QTRLE", ""},
+		{CODEC_ID_QTRLE, "QTRLE", 0, "QT rle / QT Animation", ""},
 		{CODEC_ID_DNXHD, "DNXHD", 0, "DNxHD", ""},
+		{CODEC_ID_PNG, "PNG", 0, "PNG", ""},
 		{0, NULL, 0, NULL, NULL}
 	};
 




More information about the Bf-blender-cvs mailing list