diff options
author | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-05-28 14:11:59 +0400 |
---|---|---|
committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2014-05-28 14:11:59 +0400 |
commit | 9dbd5771841c2d19aae494c9895879514e1a2f95 (patch) | |
tree | 2c504de1e9bfc0ede09ccf38e00439c38a61e2a9 /source/blender/blenkernel/intern/writeffmpeg.c | |
parent | 22cdfd6cac93435acfd38660f9af6fd1ce0fce44 (diff) |
Fix T40272: Error setting option flags2 to value fastpskip
Diffstat (limited to 'source/blender/blenkernel/intern/writeffmpeg.c')
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index c72a6bed9a6..4efc60e6198 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; } |