Commit: 39116a434038cadafbfb7e63106ff45fefdd56d8
Author: Sybren A. Stüvel
Date: Mon Apr 9 12:47:20 2018 +0200
Branches: master
https://developer.blender.org/rB39116a434038cadafbfb7e63106ff45fefdd56d8
Remove commented-out code
===================================================================
M source/blender/makesrna/intern/rna_scene.c
===================================================================
diff --git a/source/blender/makesrna/intern/rna_scene.c
b/source/blender/makesrna/intern/rna_scene.c
index 69eb4665452..532dd03eca9 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -5436,8 +5436,6 @@ static void rna_def_scene_ffmpeg_settings(BlenderRNA
*brna)
{FFMPEG_AVI, "AVI", 0, "AVI", ""},
{FFMPEG_MOV, "QUICKTIME", 0, "Quicktime", ""},
{FFMPEG_DV, "DV", 0, "DV", ""},
-// {FFMPEG_H264, "H264", 0, "H.264", ""}, not a container
-// {FFMPEG_XVID, "XVID", 0, "Xvid", ""}, not a container
{FFMPEG_OGG, "OGG", 0, "Ogg", ""},
{FFMPEG_MKV, "MKV", 0, "Matroska", ""},
{FFMPEG_FLV, "FLASH", 0, "Flash", ""},
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
https://lists.blender.org/mailman/listinfo/bf-blender-cvs
