diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-09-01 04:35:30 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-09-01 04:35:30 +0400 |
commit | 9bc92b21468f1d0fee77e7aac34145f3f0345dfc (patch) | |
tree | 797b4129bde154892f6c0c2ecdc9320688d26a7b /release/scripts/presets | |
parent | 4593e2e4108f19475d0b988ae141f04e6a4abfc0 (diff) | |
parent | 9424b1ceff992f420fe6315acabfb7138cd0026e (diff) |
svn merge -r39781:39792 https://svn.blender.org/svnroot/bf-blender/trunk/blender, merge pepper, manually merged source/blender/editors/transform/transform_generics.c
Diffstat (limited to 'release/scripts/presets')
-rw-r--r-- | release/scripts/presets/ffmpeg/DV.py | 1 | ||||
-rw-r--r-- | release/scripts/presets/ffmpeg/DVD.py | 1 | ||||
-rw-r--r-- | release/scripts/presets/ffmpeg/SVCD.py | 1 | ||||
-rw-r--r-- | release/scripts/presets/ffmpeg/VCD.py | 1 |
4 files changed, 4 insertions, 0 deletions
diff --git a/release/scripts/presets/ffmpeg/DV.py b/release/scripts/presets/ffmpeg/DV.py index 46d2a0a4a2f..926fb241747 100644 --- a/release/scripts/presets/ffmpeg/DV.py +++ b/release/scripts/presets/ffmpeg/DV.py @@ -11,3 +11,4 @@ else: bpy.context.scene.render.ffmpeg_audio_mixrate = 48000 bpy.context.scene.render.ffmpeg_audio_codec = "PCM" +bpy.context.scene.render.ffmpeg_audio_channels = 2 diff --git a/release/scripts/presets/ffmpeg/DVD.py b/release/scripts/presets/ffmpeg/DVD.py index e18ec9f817b..196b5d68406 100644 --- a/release/scripts/presets/ffmpeg/DVD.py +++ b/release/scripts/presets/ffmpeg/DVD.py @@ -21,3 +21,4 @@ bpy.context.scene.render.ffmpeg_muxrate = 10080000 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 diff --git a/release/scripts/presets/ffmpeg/SVCD.py b/release/scripts/presets/ffmpeg/SVCD.py index c71a3851af0..e4459ab5c5c 100644 --- a/release/scripts/presets/ffmpeg/SVCD.py +++ b/release/scripts/presets/ffmpeg/SVCD.py @@ -21,3 +21,4 @@ bpy.context.scene.render.ffmpeg_muxrate = 0 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 diff --git a/release/scripts/presets/ffmpeg/VCD.py b/release/scripts/presets/ffmpeg/VCD.py index faf27efe9e6..c2b73e682a2 100644 --- a/release/scripts/presets/ffmpeg/VCD.py +++ b/release/scripts/presets/ffmpeg/VCD.py @@ -21,3 +21,4 @@ bpy.context.scene.render.ffmpeg_muxrate = 2352 * 75 * 8 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 |