From 00084ea49c2423cdcc092e5d94866921bdb064ca Mon Sep 17 00:00:00 2001
From: Basilisk-Dev <basiliskdev@protonmail.com>
Date: Thu, 28 Sep 2023 09:49:10 -0400
Subject: Cherry-pick upstream libvpx fix

Backport of https://hg.mozilla.org/releases/mozilla-esr115/rev/5241232a3292943bd59ff1704eab60fee3cbc9d1
Addresses CVE-2023-5217
---
 media/libvpx/vp8/encoder/onyx_if.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/media/libvpx/vp8/encoder/onyx_if.c b/media/libvpx/vp8/encoder/onyx_if.c
index 40e29e191a..0cd3e04503 100644
--- a/media/libvpx/vp8/encoder/onyx_if.c
+++ b/media/libvpx/vp8/encoder/onyx_if.c
@@ -1557,6 +1557,10 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf)
     last_h = cpi->oxcf.Height;
     prev_number_of_layers = cpi->oxcf.number_of_layers;
 
+    if (cpi->initial_width) {
+        oxcf->multi_threaded = cpi->oxcf.multi_threaded;
+    }
+
     cpi->oxcf = *oxcf;
 
     switch (cpi->oxcf.Mode)
-- 
cgit v1.2.3