forked from bartvdbraak/blender
Fix T40272: Error setting option flags2 to value fastpskip
This commit is contained in:
parent
22cdfd6cac
commit
9dbd577184
@ -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;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user