summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBasilisk-Dev <basiliskdev@protonmail.com>2023-09-28 09:49:10 -0400
committerMoonchild <moonchild@palemoon.org>2023-09-28 16:18:01 +0200
commit00084ea49c2423cdcc092e5d94866921bdb064ca (patch)
tree92586f07019e52962777e989cf9100f550eb62c0
parentb6fae242968574324b4f094bdb82961faeecbf6a (diff)
downloaduxp-RB_20231002.tar.gz
Cherry-pick upstream libvpx fixRC_20230928-2RB_20231002
Backport of https://hg.mozilla.org/releases/mozilla-esr115/rev/5241232a3292943bd59ff1704eab60fee3cbc9d1 Addresses CVE-2023-5217
-rw-r--r--media/libvpx/vp8/encoder/onyx_if.c4
1 files changed, 4 insertions, 0 deletions
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)