Welcome to mirror list, hosted at ThFree Co, Russian Federation.

git.blender.org/blender.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJacques Lucke <mail@jlucke.com>2019-05-16 15:11:11 +0300
committerJacques Lucke <mail@jlucke.com>2019-05-16 15:11:11 +0300
commitdb5120603f8f6236d1417199f257e35e0eb8c00b (patch)
treeb2c55dedaf2b49ac8abd4f50878bcf374e71cccb /source/blender/blenkernel/intern/writeffmpeg.c
parentc0d743238d022e12872549176257db8b9d602e3d (diff)
Refactor: Simplify ID Property freeing
This also makes `IDP_CopyProperty` the "opposite" of `IDP_FreeProperty`, which is what I'd expect. Two refactoring steps: * rename IDP_FreeProperty to IDP_FreePropertyContent * new IDP_FreeProperty function that actually frees the property Reviewers: brecht Differential Revision: https://developer.blender.org/D4872
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index a74d5b241ed..ae41b8f3272 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -1616,7 +1616,7 @@ static void ffmpeg_set_expert_options(RenderData *rd)
int codec_id = rd->ffcodecdata.codec;
if (rd->ffcodecdata.properties) {
- IDP_FreeProperty(rd->ffcodecdata.properties);
+ IDP_FreePropertyContent(rd->ffcodecdata.properties);
}
if (codec_id == AV_CODEC_ID_H264) {
@@ -1680,7 +1680,7 @@ void BKE_ffmpeg_preset_set(RenderData *rd, int preset)
int isntsc = (rd->frs_sec != 25);
if (rd->ffcodecdata.properties) {
- IDP_FreeProperty(rd->ffcodecdata.properties);
+ IDP_FreePropertyContent(rd->ffcodecdata.properties);
}
switch (preset) {