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
path: root/source
diff options
context:
space:
mode:
authorJoerg Mueller <nexyon@gmail.com>2011-06-23 11:16:06 +0400
committerJoerg Mueller <nexyon@gmail.com>2011-06-23 11:16:06 +0400
commitcc246eaca7bc385738658672e66a5bca8872d5a1 (patch)
tree1d244d10cedd5c15a2b07bb92475184c2aaff7cc /source
parent2afa7e4944cd9efcf728f58360adc68343320755 (diff)
3D Audio GSoC:
- Fixes for MSVC compiling. - Fix for ffmpeg audio export with timebase, which fixes vorbis encoding (the only codec using this).
Diffstat (limited to 'source')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 26de31b2b03..0ce57a57fe7 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -859,6 +859,10 @@ int start_ffmpeg(struct Scene *scene, RenderData *rd, int rectx, int recty, Repo
specs.format = AUD_FORMAT_S16;
specs.rate = rd->ffcodecdata.audio_mixrate;
audio_mixdown_device = sound_mixdown(scene, specs, rd->sfra, rd->ffcodecdata.audio_volume);
+#ifdef FFMPEG_CODEC_TIME_BASE
+ c->time_base.den = specs.rate;
+ c->time_base.num = 1;
+#endif
}
return success;