Merge branch 'blender-v3.3-release'
This commit is contained in:
commit
5fab3bc630
|
@ -2733,7 +2733,11 @@ static void rna_FFmpegSettings_codec_update(Main *UNUSED(bmain),
|
|||
PointerRNA *ptr)
|
||||
{
|
||||
FFMpegCodecData *codec_data = (FFMpegCodecData *)ptr->data;
|
||||
if (!ELEM(codec_data->codec, AV_CODEC_ID_H264, AV_CODEC_ID_MPEG4, AV_CODEC_ID_VP9)) {
|
||||
if (!ELEM(codec_data->codec,
|
||||
AV_CODEC_ID_H264,
|
||||
AV_CODEC_ID_MPEG4,
|
||||
AV_CODEC_ID_VP9,
|
||||
AV_CODEC_ID_DNXHD)) {
|
||||
/* Constant Rate Factor (CRF) setting is only available for H264,
|
||||
* MPEG4 and WEBM/VP9 codecs. So changing encoder quality mode to
|
||||
* CBR as CRF is not supported.
|
||||
|
|
Loading…
Reference in New Issue