[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [40956] trunk/blender/source/blender/ blenloader/intern/readfile.c: Workaround for #28864: crash rendering out file with audio, due to scene audio

[Brecht Van Lommel]

Revision: 40956
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=40956
Author:   blendix
Date:     2011-10-12 13:43:56 +0000 (Wed, 12 Oct 2011)
Log Message:
-----------
Workaround for #28864: crash rendering out file with audio, due to scene audio
channels being set to invalid value 0. The cause of this is unclear, this adds
a version patch just to be safe, in case it turns out to be a common issue.

Modified Paths:
--------------
    trunk/blender/source/blender/blenloader/intern/readfile.c

Modified: trunk/blender/source/blender/blenloader/intern/readfile.c
===================================================================
--- trunk/blender/source/blender/blenloader/intern/readfile.c	2011-10-12 13:07:30 UTC (rev 40955)
+++ trunk/blender/source/blender/blenloader/intern/readfile.c	2011-10-12 13:43:56 UTC (rev 40956)
@@ -12163,9 +12163,16 @@
 			Scene *sce;
 			bNodeTree *ntree;
 			
-			for (sce=main->scene.first; sce; sce=sce->id.next)
+			for (sce=main->scene.first; sce; sce=sce->id.next) {
+				/* there are files with invalid audio_channels value, the real cause
+				   is unknown, but we fix it here anyway to avoid crashes */
+				if(sce->r.ffcodecdata.audio_channels == 0)
+					sce->r.ffcodecdata.audio_channels = 2;
+
 				if (sce->nodetree)
 					do_versions_nodetree_image_default_alpha_output(sce->nodetree);
+			}
+
 			for (ntree=main->nodetree.first; ntree; ntree=ntree->id.next)
 				do_versions_nodetree_image_default_alpha_output(ntree);
 		}