diff options
| author | Jeroen Bakker <j.bakker@atmind.nl> | 2022-03-02 18:03:01 +0300 |
|---|---|---|
| committer | Jeroen Bakker <j.bakker@atmind.nl> | 2022-03-02 18:03:01 +0300 |
| commit | a41c2a513761e8884e92526b069ff6eed8168676 (patch) | |
| tree | e624093127815a09d2807dccddaabea35510e154 /source/blender/blenkernel/BKE_writeffmpeg.h | |
| parent | a23b4429915ca8597510b57353c4df331487c620 (diff) | |
| parent | c23ec04b4e30f300a670f1cb1dc882e0608d09ad (diff) | |
Merge branch 'master' into temp-image-buffer-rasterizertemp-image-buffer-rasterizer
Diffstat (limited to 'source/blender/blenkernel/BKE_writeffmpeg.h')
| -rw-r--r-- | source/blender/blenkernel/BKE_writeffmpeg.h | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/source/blender/blenkernel/BKE_writeffmpeg.h b/source/blender/blenkernel/BKE_writeffmpeg.h index cf4a8137638..3f92d6fa117 100644 --- a/source/blender/blenkernel/BKE_writeffmpeg.h +++ b/source/blender/blenkernel/BKE_writeffmpeg.h @@ -69,12 +69,8 @@ void BKE_ffmpeg_filepath_get(char *string, void BKE_ffmpeg_preset_set(struct RenderData *rd, int preset); void BKE_ffmpeg_image_type_verify(struct RenderData *rd, struct ImageFormatData *imf); -void BKE_ffmpeg_codec_settings_verify(struct RenderData *rd); bool BKE_ffmpeg_alpha_channel_is_supported(const struct RenderData *rd); -int BKE_ffmpeg_property_add_string(struct RenderData *rd, const char *type, const char *str); -void BKE_ffmpeg_property_del(struct RenderData *rd, void *type, void *prop_); - void *BKE_ffmpeg_context_create(void); void BKE_ffmpeg_context_free(void *context_v); |