Sound:

[blender.git] / source / blender / blenkernel / intern / writeffmpeg.c

diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index a90924055b3605fcc31cbd67a633fcf3c18827ad..1953058fddf4a1142ff1351ebc5ad646d62ca034 100644 (file)
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -559,7 +559,7 @@ static AVStream* alloc_audio_stream(RenderData *rd, int codec_id, AVFormatContex
        c->codec_id = codec_id;
        c->codec_type = CODEC_TYPE_AUDIO;
 
-       c->sample_rate = rd->audio.mixrate;
+       c->sample_rate = rd->ffcodecdata.audio_mixrate;
        c->bit_rate = ffmpeg_audio_bitrate*1000;
        c->channels = 2;
        codec = avcodec_find_encoder(c->codec_id);
@@ -734,7 +734,7 @@ static void start_ffmpeg_impl(struct RenderData *rd, int rectx, int recty)
 
        if (ffmpeg_type == FFMPEG_DV) {
                fmt->audio_codec = CODEC_ID_PCM_S16LE;
-               if (ffmpeg_multiplex_audio && rd->audio.mixrate != 48000) {
+               if (ffmpeg_multiplex_audio && rd->ffcodecdata.audio_mixrate != 48000) {
                        G.afbreek = 1;
                        //XXX error("FFMPEG only supports 48khz / stereo "
                        //      "audio for DV!");
@@ -831,7 +831,6 @@ static void makeffmpegstring(RenderData* rd, char* string) {
        }
 }
 
-
 void start_ffmpeg(struct Scene *scene, RenderData *rd, int rectx, int recty)
 {
        ffmpeg_autosplit_count = 0;
@@ -844,8 +843,8 @@ void start_ffmpeg(struct Scene *scene, RenderData *rd, int rectx, int recty)
                AUD_Specs specs;
                specs.channels = c->channels;
                specs.format = AUD_FORMAT_S16;
-               specs.rate = rd->audio.mixrate;
-               audio_mixdown_device = sound_mixdown(scene, specs, rd->sfra, rd->efra);
+               specs.rate = rd->ffcodecdata.audio_mixrate;
+               audio_mixdown_device = sound_mixdown(scene, specs, rd->sfra, rd->efra, rd->ffcodecdata.audio_volume);
        }
 }