Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2010-02-08 02:41:17 +0300
committerJoerg Mueller <nexyon@gmail.com>2010-02-08 02:41:17 +0300
commit9827a3e9eac70f68db6dc16d03016c51b7ece3f0 (patch)
tree8825b454008d3b97a64018884c179ea94874af44 /release
parent2f72b91a54faa7cfbdfd97eff608c8911df1d221 (diff)
2.5 Audio:
- recode of the whole sequencer audio handling - encode audio flag removed, instead you choose None as audio codec, added None for video codec too - ffmpeg formats/codecs: enabled: theora, ogg, vorbis; added: matroska, flac (not working, who can fix?), mp3, wav - sequencer wave drawing - volume animation (now also working when mixing down to a file!) - made sequencer strip position and length values unanimatable
Diffstat (limited to 'release')
-rw-r--r--release/scripts/ui/properties_render.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/release/scripts/ui/properties_render.py b/release/scripts/ui/properties_render.py
index c7f8ddd052c..0eb46955a0c 100644
--- a/release/scripts/ui/properties_render.py
+++ b/release/scripts/ui/properties_render.py
@@ -416,11 +416,11 @@ class RENDER_PT_encoding(RenderButtonsPanel):
col.prop(rd, "ffmpeg_packetsize", text="Packet Size")
# Audio:
- layout.prop(rd, "ffmpeg_multiplex_audio", text="Audio")
-
sub = layout.column()
- sub.active = rd.ffmpeg_multiplex_audio
- sub.prop(rd, "ffmpeg_audio_codec", text="Codec")
+
+ if rd.ffmpeg_format not in ('MP3'):
+ sub.prop(rd, "ffmpeg_audio_codec", text="Audio Codec")
+
sub.separator()
split = sub.split()