blender
/
blender
136
405
Fork 586
Code Issues 6.2k Pull Requests 758 Projects 19 Wiki Activity

Merge branch 'blender-v3.1-release'

This commit is contained in:
Richard Antalik 2022-02-01 00:10:47 +01:00
parent 1d1859c3c4 f420118335
commit 95005bbe02
Notes: blender-bot 2023-02-14 01:21:16 +01:00 
Referenced by issue #102144, Regression: Specific Geometry Nodes tree (involving curve nodes) crashes with specific input mesh
Referenced by issue #97790, Regression: Crash when setting Outliner to "Blender File" with old files (IPO IDs)
Referenced by issue #95499, Regression. Nurbs path: Active point do not show proper (active) color after adding path
Referenced by issue #95428, Regression: 3.1 & 3.2 Image/UV Editor poor performance (Byte textures, window dragging, maximizing area)
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
source/blender/blenkernel/intern/writeffmpeg.c
View File

@ -726,14 +726,12 @@ static AVStream *alloc_video_stream(FFMpegContext *context,
}
}
if (codec_id == AV_CODEC_ID_VP9) {
if (rd->im_format.planes == R_IMF_PLANES_RGBA) {
c->pix_fmt = AV_PIX_FMT_YUVA420P;
}
if (codec_id == AV_CODEC_ID_VP9 && rd->im_format.planes == R_IMF_PLANES_RGBA) {
c->pix_fmt = AV_PIX_FMT_YUVA420P;
}
/* Use 4:4:4 instead of 4:2:0 pixel format for lossless rendering. */
if ((codec_id == AV_CODEC_ID_H264 || codec_id == AV_CODEC_ID_VP9) && context->ffmpeg_crf == 0) {
else if ((codec_id == AV_CODEC_ID_H264 || codec_id == AV_CODEC_ID_VP9) &&
context->ffmpeg_crf == 0) {
/* Use 4:4:4 instead of 4:2:0 pixel format for lossless rendering. */
c->pix_fmt = AV_PIX_FMT_YUV444P;
}