diff options
| author | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-18 20:20:06 +0300 |
|---|---|---|
| committer | Sebastian Parborg <darkdefende@gmail.com> | 2022-02-18 20:24:16 +0300 |
| commit | af6a1b08e3f0d0070ac9423868d2d3f81057717a (patch) | |
| tree | 57bfa6025b063480d5014d0b40e2985df915229e /source/blender/makesdna | |
| parent | 82c3bef7655bb115f739842b815a2ee1c40a9320 (diff) | |
VSE: Refactor our code to be compatible with ffmpeg 5.0
In ffmpeg 5.0, several variables were made const to try to prevent bad API usage.
Removed some dead code that wasn't used anymore as well.
Reviewed By: Richard Antalik
Differential Revision: http://developer.blender.org/D14063
Diffstat (limited to 'source/blender/makesdna')
| -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 864358e040c..45fd4895f77 100644 --- a/source/blender/makesdna/DNA_scene_types.h +++ b/source/blender/makesdna/DNA_scene_types.h @@ -157,7 +157,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. */ @@ -172,9 +171,7 @@ typedef struct FFMpegCodecData { int rc_buffer_size; int mux_packet_size; int mux_rate; - char _pad1[4]; - - IDProperty *properties; + void *_pad1; } FFMpegCodecData; /* ************************************************************* */ |