diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2011-08-03 16:44:52 +0400 |
| commit | eb9d591898e93dbbe9e28865018175b9da730596 (patch) | |
| tree | 3209caefe505273e834a936e54f6146a4185e83b /release/scripts/presets | |
| parent | 6d7490632f13f9744c6b3e507c838a34f3481846 (diff) | |
| parent | f1fb54e126824ff38b8bf26fa80f3f46c886bd45 (diff) | |
* Merging trunk up to r38981.
* Fixing a minor issue in a previous commit.
Diffstat (limited to 'release/scripts/presets')
| -rw-r--r-- | release/scripts/presets/ffmpeg/xvid.py | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/release/scripts/presets/ffmpeg/xvid.py b/release/scripts/presets/ffmpeg/xvid.py index fa64562e566..c006ba267cc 100644 --- a/release/scripts/presets/ffmpeg/xvid.py +++ b/release/scripts/presets/ffmpeg/xvid.py @@ -1,8 +1,7 @@ import bpy is_ntsc = (bpy.context.scene.render.fps != 25) -bpy.context.scene.render.ffmpeg_format = "AVI" -bpy.context.scene.render.ffmpeg_codec = "XVID" +bpy.context.scene.render.ffmpeg_format = "XVID" if is_ntsc: bpy.context.scene.render.ffmpeg_gopsize = 18 |