Commit: 9dbd5771841c2d19aae494c9895879514e1a2f95
Author: Sergey Sharybin
Date: Wed May 28 16:11:59 2014 +0600
https://developer.blender.org/rB9dbd5771841c2d19aae494c9895879514e1a2f95
Fix T40272: Error setting option flags2 to value fastpskip
===================================================================
M source/blender/blenkernel/intern/writeffmpeg.c
===================================================================
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c
b/source/blender/blenkernel/intern/writeffmpeg.c
index c72a6be..4efc60e 100644
--- a/source/blender/blenkernel/intern/writeffmpeg.c
+++ b/source/blender/blenkernel/intern/writeffmpeg.c
@@ -105,6 +105,7 @@ static AUD_Device *audio_mixdown_device = 0;
static void ffmpeg_dict_set_int(AVDictionary **dict, const char *key, int
value);
static void ffmpeg_dict_set_float(AVDictionary **dict, const char *key, float
value);
+static void ffmpeg_set_expert_options(RenderData *rd);
/* Delete a picture buffer */
@@ -488,6 +489,19 @@ static void set_ffmpeg_properties(RenderData *rd,
AVCodecContext *c, const char
void *iter;
IDProperty *curr;
+ /* TODO(sergey): This is actually rather stupid, because changing
+ * codec settings in render panel would also set expert options.
+ *
+ * But we need ti here in order to get rid of deprecated settings
+ * when opening old files in new blender.
+ *
+ * For as long we don't allow editing properties in the interface
+ * it's all good. bug if we allow editing them, we'll need to
+ * repace it with some smarter code which would port settings
+ * from deprecated to new one.
+ */
+ ffmpeg_set_expert_options(rd);
+
if (!rd->ffcodecdata.properties) {
return;
}
_______________________________________________
Bf-blender-cvs mailing list
Bf-blender-cvs@blender.org
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
