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:
authorBastien Montagne <montagne29@wanadoo.fr>2011-11-15 14:01:18 +0400
committerBastien Montagne <montagne29@wanadoo.fr>2011-11-15 14:01:18 +0400
commit995ca539d0a91a0b76e0700b3d76980537877028 (patch)
treef39ad7d091a8cc32ad2cadd58a819bd7f579a8d6
parentba9b5f41ec1d08869d2f4227e779b6e7eae09913 (diff)
Fixed compilation error in writeffmpg.c (caused by recent IDProp changes).
-rw-r--r--source/blender/blenkernel/intern/writeffmpeg.c10
1 files changed, 6 insertions, 4 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c
index 036a52a1235..3af724b4e30 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -1066,13 +1066,13 @@ IDProperty *ffmpeg_property_add(RenderData *rd, const char *type, int opt_index,
if (!rd->ffcodecdata.properties) {
rd->ffcodecdata.properties
- = IDP_New(IDP_GROUP, val, "ffmpeg");
+ = IDP_New(IDP_GROUP, &val, "ffmpeg");
}
group = IDP_GetPropertyFromGroup(rd->ffcodecdata.properties, type);
if (!group) {
- group = IDP_New(IDP_GROUP, val, type);
+ group = IDP_New(IDP_GROUP, &val, type);
IDP_AddToGroup(rd->ffcodecdata.properties, group);
}
@@ -1102,7 +1102,9 @@ IDProperty *ffmpeg_property_add(RenderData *rd, const char *type, int opt_index,
idp_type = IDP_FLOAT;
break;
case FF_OPT_TYPE_STRING:
- val.str = (char *)" ";
+ val.string.str = (char *)" ";
+ val.string.len = 80;
+/* val.str = (char *)" ";*/
idp_type = IDP_STRING;
break;
case FF_OPT_TYPE_CONST:
@@ -1112,7 +1114,7 @@ IDProperty *ffmpeg_property_add(RenderData *rd, const char *type, int opt_index,
default:
return NULL;
}
- prop = IDP_New(idp_type, val, name);
+ prop = IDP_New(idp_type, &val, name);
IDP_AddToGroup(group, prop);
return prop;
}