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:
authorRichard Antalik <richardantalik@gmail.com>2022-08-17 06:12:34 +0300
committerRichard Antalik <richardantalik@gmail.com>2022-08-17 06:12:34 +0300
commit5fab3bc630f8c0572c8afa7c68f45abe6f2e412f (patch)
tree55e7f8ae8673a94a2ee74773940c15361f1c23c0
parent48da8c40405c3901df87b6388128ca2d73a4f656 (diff)
parent06a01168f669aa223f87f6b65538ce36c5300157 (diff)
Merge branch 'blender-v3.3-release'
-rw-r--r--source/blender/makesrna/intern/rna_scene.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/source/blender/makesrna/intern/rna_scene.c b/source/blender/makesrna/intern/rna_scene.c
index 5abcbb14904..720b115c73b 100644
--- a/source/blender/makesrna/intern/rna_scene.c
+++ b/source/blender/makesrna/intern/rna_scene.c
@@ -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.