[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [42923] trunk/blender/release/scripts/ presets/ffmpeg: Fix #29707: Sequencer presets corrupt audio scene settings

[Sergey Sharybin]

Revision: 42923
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=42923
Author:   nazgul
Date:     2011-12-28 12:39:35 +0000 (Wed, 28 Dec 2011)
Log Message:
-----------
Fix #29707: Sequencer presets corrupt audio scene settings

Problem was caused by using amount of channels as integer instead of enum
identifiers in preset files.

Modified Paths:
--------------
    trunk/blender/release/scripts/presets/ffmpeg/DV.py
    trunk/blender/release/scripts/presets/ffmpeg/DVD.py
    trunk/blender/release/scripts/presets/ffmpeg/SVCD.py
    trunk/blender/release/scripts/presets/ffmpeg/VCD.py

Modified: trunk/blender/release/scripts/presets/ffmpeg/DV.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/DV.py	2011-12-28 12:35:58 UTC (rev 42922)
+++ trunk/blender/release/scripts/presets/ffmpeg/DV.py	2011-12-28 12:39:35 UTC (rev 42923)
@@ -11,4 +11,4 @@
 
 bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
 bpy.context.scene.render.ffmpeg_audio_codec = "PCM"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"

Modified: trunk/blender/release/scripts/presets/ffmpeg/DVD.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/DVD.py	2011-12-28 12:35:58 UTC (rev 42922)
+++ trunk/blender/release/scripts/presets/ffmpeg/DVD.py	2011-12-28 12:39:35 UTC (rev 42923)
@@ -21,4 +21,4 @@
 bpy.context.scene.render.ffmpeg_audio_codec = "AC3"
 bpy.context.scene.render.ffmpeg_audio_bitrate = 448
 bpy.context.scene.render.ffmpeg_audio_mixrate = 48000
-bpy.context.scene.render.ffmpeg_audio_channels = 6
+bpy.context.scene.render.ffmpeg_audio_channels = "SURROUND51"

Modified: trunk/blender/release/scripts/presets/ffmpeg/SVCD.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/SVCD.py	2011-12-28 12:35:58 UTC (rev 42922)
+++ trunk/blender/release/scripts/presets/ffmpeg/SVCD.py	2011-12-28 12:39:35 UTC (rev 42923)
@@ -21,4 +21,4 @@
 bpy.context.scene.render.ffmpeg_audio_bitrate = 224
 bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
 bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"

Modified: trunk/blender/release/scripts/presets/ffmpeg/VCD.py
===================================================================
--- trunk/blender/release/scripts/presets/ffmpeg/VCD.py	2011-12-28 12:35:58 UTC (rev 42922)
+++ trunk/blender/release/scripts/presets/ffmpeg/VCD.py	2011-12-28 12:39:35 UTC (rev 42923)
@@ -21,4 +21,4 @@
 bpy.context.scene.render.ffmpeg_audio_bitrate = 224
 bpy.context.scene.render.ffmpeg_audio_mixrate = 44100
 bpy.context.scene.render.ffmpeg_audio_codec = "MP2"
-bpy.context.scene.render.ffmpeg_audio_channels = 2
+bpy.context.scene.render.ffmpeg_audio_channels = "STEREO"