diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-18 20:25:31 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-18 20:25:31 +0300 |
| commit | c2016feadc8fe83565ea1e405e36221d05163e5b (patch) | |
| tree | 3c2694e6235e82ea2415be2606d2ca3f4e1d7805 /source/blender/makesdna/DNA_scene_types.h | |
| parent | 16ab6111f758ef77bd0e53ce2379ee8281629776 (diff) | |
| parent | af6a1b08e3f0d0070ac9423868d2d3f81057717a (diff) | |
Merge branch 'blender-v3.1-release'
Diffstat (limited to 'source/blender/makesdna/DNA_scene_types.h')
| -rw-r--r-- | source/blender/makesdna/DNA_scene_types.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/source/blender/makesdna/DNA_scene_types.h b/source/blender/makesdna/DNA_scene_types.h index 92ddc1a71c4..daecb3d7a31 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -141,7 +141,6 @@ typedef struct FFMpegCodecData { int audio_bitrate; int audio_mixrate; int audio_channels; - char _pad0[4]; float audio_volume; int gop_size; /** Only used if FFMPEG_USE_MAX_B_FRAMES flag is set. */ @@ -156,9 +155,7 @@ typedef struct FFMpegCodecData { int rc_buffer_size; int mux_packet_size; int mux_rate; - char _pad1[4]; - - IDProperty *properties; + void *_pad1; } FFMpegCodecData; /* ************************************************************* */ |