Merging with trunk up to r38631.

[blender-staging.git] / source / blender / makesdna / DNA_scene_types.h

diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h
index 8203a4dd77c14a0f2575d9abd7791044ff6d91b9..937c33d6a651ce66b285c5d4c2e3e726d6e98815 100644 (file)
--- a/source/blender/makesdna/DNA_scene_types.h
+++ b/source/blender/makesdna/DNA_scene_types.h
@@ -126,6 +126,8 @@ typedef struct FFMpegCodecData {
        int video_bitrate;
        int audio_bitrate;
        int audio_mixrate;
+       int audio_channels;
+       int audio_pad;
        float audio_volume;
        int gop_size;
        int flags;