From 353fe610ed2d31bda2da93f59a174fe1642d96ad Mon Sep 17 00:00:00 2001
From: Hans Goudey <h.goudey@me.com>
Date: Tue, 22 Feb 2022 11:14:50 -0500
Subject: [PATCH 1/2] Fix: Clear mesh runtime cache when adding elements

Currently the RNA functions to add mesh elements like vertices
don't clear the runtime cache of things like triangulation, BVH
trees, etc. This is important, since they might be accessed with
incorrect sizes. This is split from a fix for T95839.
---
 source/blender/editors/mesh/mesh_data.c | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/source/blender/editors/mesh/mesh_data.c b/source/blender/editors/mesh/mesh_data.c
index 0f58752f323..7a089d7101e 100644
--- a/source/blender/editors/mesh/mesh_data.c
+++ b/source/blender/editors/mesh/mesh_data.c
@@ -37,6 +37,7 @@
 #include "BKE_customdata.h"
 #include "BKE_editmesh.h"
 #include "BKE_mesh.h"
+#include "BKE_mesh_runtime.h"
 #include "BKE_report.h"
 
 #include "DEG_depsgraph.h"
@@ -1126,6 +1127,8 @@ static void mesh_add_verts(Mesh *mesh, int len)
   mesh->vdata = vdata;
   BKE_mesh_update_customdata_pointers(mesh, false);
 
+  BKE_mesh_runtime_clear_cache(mesh);
+
   /* scan the input list and insert the new vertices */
 
   /* set default flags */
@@ -1162,6 +1165,8 @@ static void mesh_add_edges(Mesh *mesh, int len)
   mesh->edata = edata;
   BKE_mesh_update_customdata_pointers(mesh, false); /* new edges don't change tessellation */
 
+  BKE_mesh_runtime_clear_cache(mesh);
+
   /* set default flags */
   medge = &mesh->medge[mesh->totedge];
   for (i = 0; i < len; i++, medge++) {
@@ -1190,6 +1195,8 @@ static void mesh_add_loops(Mesh *mesh, int len)
     CustomData_add_layer(&ldata, CD_MLOOP, CD_CALLOC, NULL, totloop);
   }
 
+  BKE_mesh_runtime_clear_cache(mesh);
+
   CustomData_free(&mesh->ldata, mesh->totloop);
   mesh->ldata = ldata;
   BKE_mesh_update_customdata_pointers(mesh, true);
@@ -1221,6 +1228,8 @@ static void mesh_add_polys(Mesh *mesh, int len)
   mesh->pdata = pdata;
   BKE_mesh_update_customdata_pointers(mesh, true);
 
+  BKE_mesh_runtime_clear_cache(mesh);
+
   /* set default flags */
   mpoly = &mesh->mpoly[mesh->totpoly];
   for (i = 0; i < len; i++, mpoly++) {

From 283a4cd40e6d07a55027298d693d9fba9a8a6f30 Mon Sep 17 00:00:00 2001
From: Sebastian Parborg <darkdefende@gmail.com>
Date: Tue, 22 Feb 2022 17:30:52 +0100
Subject: [PATCH 2/2] Fix ffmpeg tests when using ffmpeg 5.0

---
 intern/ffmpeg/tests/ffmpeg_codecs.cc | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/intern/ffmpeg/tests/ffmpeg_codecs.cc b/intern/ffmpeg/tests/ffmpeg_codecs.cc
index 9538bac84d2..157731bf1f2 100644
--- a/intern/ffmpeg/tests/ffmpeg_codecs.cc
+++ b/intern/ffmpeg/tests/ffmpeg_codecs.cc
@@ -2,12 +2,13 @@
 
 extern "C" {
 #include <libavcodec/avcodec.h>
+#include <libavutil/channel_layout.h>
 #include <libavutil/log.h>
 }
 
 namespace {
 
-bool test_vcodec(AVCodec *codec, AVPixelFormat pixelformat)
+bool test_vcodec(const AVCodec *codec, AVPixelFormat pixelformat)
 {
   av_log_set_level(AV_LOG_QUIET);
   bool result = false;
@@ -28,7 +29,7 @@ bool test_vcodec(AVCodec *codec, AVPixelFormat pixelformat)
   }
   return result;
 }
-bool test_acodec(AVCodec *codec, AVSampleFormat fmt)
+bool test_acodec(const AVCodec *codec, AVSampleFormat fmt)
 {
   av_log_set_level(AV_LOG_QUIET);
   bool result = false;
@@ -52,7 +53,7 @@ bool test_acodec(AVCodec *codec, AVSampleFormat fmt)
 bool test_codec_video_by_codecid(AVCodecID codec_id, AVPixelFormat pixelformat)
 {
   bool result = false;
-  AVCodec *codec = avcodec_find_encoder(codec_id);
+  const AVCodec *codec = avcodec_find_encoder(codec_id);
   if (codec)
     result = test_vcodec(codec, pixelformat);
   return result;
@@ -61,7 +62,7 @@ bool test_codec_video_by_codecid(AVCodecID codec_id, AVPixelFormat pixelformat)
 bool test_codec_video_by_name(const char *codecname, AVPixelFormat pixelformat)
 {
   bool result = false;
-  AVCodec *codec = avcodec_find_encoder_by_name(codecname);
+  const AVCodec *codec = avcodec_find_encoder_by_name(codecname);
   if (codec)
     result = test_vcodec(codec, pixelformat);
   return result;
@@ -70,7 +71,7 @@ bool test_codec_video_by_name(const char *codecname, AVPixelFormat pixelformat)
 bool test_codec_audio_by_codecid(AVCodecID codec_id, AVSampleFormat fmt)
 {
   bool result = false;
-  AVCodec *codec = avcodec_find_encoder(codec_id);
+  const AVCodec *codec = avcodec_find_encoder(codec_id);
   if (codec)
     result = test_acodec(codec, fmt);
   return result;
@@ -79,7 +80,7 @@ bool test_codec_audio_by_codecid(AVCodecID codec_id, AVSampleFormat fmt)
 bool test_codec_audio_by_name(const char *codecname, AVSampleFormat fmt)
 {
   bool result = false;
-  AVCodec *codec = avcodec_find_encoder_by_name(codecname);
+  const AVCodec *codec = avcodec_find_encoder_by_name(codecname);
   if (codec)
     result = test_acodec(codec, fmt);
   return result;