Revision: 37028 http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=37028 Author: blendix Date: 2011-05-30 18:57:28 +0000 (Mon, 30 May 2011) Log Message: ----------- startup.blend: default ffmpeg output audio bitrate changed to 192.
Modified Paths: -------------- trunk/blender/source/blender/blenkernel/intern/scene.c trunk/blender/source/blender/editors/datafiles/startup.blend.c Modified: trunk/blender/source/blender/blenkernel/intern/scene.c =================================================================== --- trunk/blender/source/blender/blenkernel/intern/scene.c 2011-05-30 16:33:23 UTC (rev 37027) +++ trunk/blender/source/blender/blenkernel/intern/scene.c 2011-05-30 18:57:28 UTC (rev 37028) @@ -468,6 +468,7 @@ sce->r.ffcodecdata.audio_mixrate = 44100; sce->r.ffcodecdata.audio_volume = 1.0f; + sce->r.ffcodecdata.audio_bitrate = 192; BLI_strncpy(sce->r.engine, "BLENDER_RENDER", sizeof(sce->r.engine)); Modified: trunk/blender/source/blender/editors/datafiles/startup.blend.c =================================================================== --- trunk/blender/source/blender/editors/datafiles/startup.blend.c 2011-05-30 16:33:23 UTC (rev 37027) +++ trunk/blender/source/blender/editors/datafiles/startup.blend.c 2011-05-30 18:57:28 UTC (rev 37028) @@ -1,12505 +1,10940 @@ /* DataToC output of file <startup_blend> */ -int datatoc_startup_blend_size= 399988; +int datatoc_startup_blend_size= 349868; char datatoc_startup_blend[]= { - 66, 76, 69, 78, 68, 69, 82, 45,118, 50, 53, 55, 82, 69, 78, 68, 32, 0, 0, 0, - 32,137,231, 62,255,127, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 1, 0, 0, 0,250, 0, 0, 0, 83, 99,101,110,101, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 76, 79, 66, 32, 1, 0, 0, 48,136,231, 62,255,127, 0, 0, - 198, 0, 0, 0, 1, 0, 0, 0, 32, 32, 32, 49, 1, 0, 0, 0,250, 0, 0, 0, 1, 0, 0, 1,248, 60,138, 3, 0, 0, 0, 0, - 24,188,140, 3, 0, 0, 0, 0, 0, 16, 0, 0,128, 32, 4, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 87, 77, 0, 0, 24, 1, 0, 0, 8,113,137, 3, 0, 0, 0, 0,105, 1, 0, 0, 1, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 87, 77, 87,105,110, 77, 97,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,104,114,137, 3, 0, 0, 0, 0,104,114,137, 3, 0, 0, 0, 0,104,114,137, 3, 0, 0, 0, 0, - 104,114,137, 3, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,184,141,111, 4, 0, 0, 0, 0,184,141,111, 4, 0, 0, 0, 0, - 16, 0, 0, 0, 2, 0, 0, 0, 2, 0, 0, 0, 0, 0, 0, 0, 88,117,132, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 88, 2,130, 3, 0, 0, 0, 0, 88, 2,130, 3, 0, 0, 0, 0, 88, 2,130, 3, 0, 0, 0, 0, - 232, 65,145, 3, 0, 0, 0, 0, 88,117,132, 3, 0, 0, 0, 0,232, 65,145, 3, 0, 0, 0, 0, 68, 65, 84, 65,224, 0, 0, 0, - 104,114,137, 3, 0, 0, 0, 0,106, 1, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 48, 27,104, 2, 0, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0,248, 60,138, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 115, 99,114,101,101,110, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 4, 0,229, 0,120, 7, 16, 4, 0, 0, 0, 0, 1, 0,238, 3, 0, 0, 0, 0, 1, 0, 0, 0, 40, 22,126, 2, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 3, 0, 0, 0, 0, 0, 0, 0,248, 37,136, 3, 0, 0, 0, 0, - 8,174,105, 3, 0, 0, 0, 0, 8,174,105, 3, 0, 0, 0, 0, 8, 69,145, 3, 0, 0, 0, 0,104, 67,145, 3, 0, 0, 0, 0, - 56, 68,145, 3, 0, 0, 0, 0, 56, 68,145, 3, 0, 0, 0, 0,216, 69,145, 3, 0, 0, 0, 0, 24,118,145, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 83, 78, 0, 0,216, 0, 0, 0,152,115,137, 3, 0, 0, 0, 0, - 192, 0, 0, 0, 1, 0, 0, 0,216,208,137, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 83, 82, 65,110,105,109, 97,116,105,111,110, 0, 46, 48, 48, 49, 0, 0, 0, 0, 0, 0, 0, 0, - 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,248,206,129, 3, 0, 0, 0, 0,152,117,137, 3, 0, 0, 0, 0, - 8,118,137, 3, 0, 0, 0, 0, 72,130,137, 3, 0, 0, 0, 0,184,130,137, 3, 0, 0, 0, 0, 56,199,137, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 24,188,140, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 6, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 68, 65, 84, 65, 32, 0, 0, 0,248,206,129, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0,136,244,115, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, - 136,244,115, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0,216,171,116, 3, 0, 0, 0, 0,248,206,129, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 97, 4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,216,171,116, 3, 0, 0, 0, 0, - 193, 0, 0, 0, 1, 0, 0, 0, 72,113,129, 3, 0, 0, 0, 0,136,244,115, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 118, 7, 97, 4, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, 72,113,129, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, - 216, 92, 86, 2, 0, 0, 0, 0,216,171,116, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,118, 7, 0, 0, 0, 0, 0, 0, - 68, 65, 84, 65, 32, 0, 0, 0,216, 92, 86, 2, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, 56,180,116, 3, 0, 0, 0, 0, - 72,113,129, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 70, 4, 1, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, - 56,180,116, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, 8,183,128, 3, 0, 0, 0, 0,216, 92, 86, 2, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,118, 7, 70, 4, 1, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, 8,183,128, 3, 0, 0, 0, 0, - 193, 0, 0, 0, 1, 0, 0, 0,232, 8,116, 3, 0, 0, 0, 0, 56,180,116, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 44, 6, 0, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,232, 8,116, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, - 104, 62,126, 2, 0, 0, 0, 0, 8,183,128, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 6, 70, 4, 1, 0, 0, 0, - 68, 65, 84, 65, 32, 0, 0, 0,104, 62,126, 2, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0,168,217,128, 3, 0, 0, 0, 0, - 232, 8,116, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 6,220, 1, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, - 168,217,128, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, 40, 14,116, 3, 0, 0, 0, 0,104, 62,126, 2, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,118, 7,220, 1, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, 40, 14,116, 3, 0, 0, 0, 0, - 193, 0, 0, 0, 1, 0, 0, 0,168,239,117, 3, 0, 0, 0, 0,168,217,128, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,132, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,168,239,117, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, - 40,147,129, 3, 0, 0, 0, 0, 40, 14,116, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 6,132, 0, 0, 0, 0, 0, - 68, 65, 84, 65, 32, 0, 0, 0, 40,147,129, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0,104,200,129, 3, 0, 0, 0, 0, - 168,239,117, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,160, 2,132, 0, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, - 104,200,129, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0,232,233,146, 3, 0, 0, 0, 0, 40,147,129, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,160, 2, 70, 4, 1, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,232,233,146, 3, 0, 0, 0, 0, - 193, 0, 0, 0, 1, 0, 0, 0,184,116,137, 3, 0, 0, 0, 0,104,200,129, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, - 0, 0,140, 1, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0,184,116,137, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, - 40,117,137, 3, 0, 0, 0, 0,232,233,146, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,160, 2,140, 1, 0, 0, 0, 0, - 68, 65, 84, 65, 32, 0, 0, 0, 40,117,137, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0,152,117,137, 3, 0, 0, 0, 0, - 184,116,137, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 44, 6,100, 3, 0, 0, 0, 0, 68, 65, 84, 65, 32, 0, 0, 0, - 152,117,137, 3, 0, 0, 0, 0,193, 0, 0, 0, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 40,117,137, 3, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0,118, 7,100, 3, 0, 0, 0, 0, 68, 65, 84, 65, 40, 0, 0, 0, 8,118,137, 3, 0, 0, 0, 0, @@ Diff output truncated at 10240 characters. @@ _______________________________________________ Bf-blender-cvs mailing list Bf-blender-cvs@blender.org http://lists.blender.org/mailman/listinfo/bf-blender-cvs