diff options
author | Moonchild <moonchild@palemoon.org> | 2023-09-28 14:14:15 +0000 |
---|---|---|
committer | Moonchild <moonchild@palemoon.org> | 2023-09-28 14:14:15 +0000 |
commit | 07df24f00f07d08a0d73b445ab83e7d5b0c8e8b5 (patch) | |
tree | c9190ccc9eecfaf44ea49c4aaf1b6e553b829b37 /media | |
parent | 395caa87807fcf3c8220600a71a26d6ea728b581 (diff) | |
parent | ed7b08e6089de2dd9a1cee595d9ff7ed1fae919d (diff) | |
download | uxp-07df24f00f07d08a0d73b445ab83e7d5b0c8e8b5.tar.gz |
Merge pull request 'Cherry-pick upstream libvpx fix for CVE-2023-5217' (#2320) from Basilisk-Dev/UXP-contrib:libvpx-cve into master
Reviewed-on: https://repo.palemoon.org/MoonchildProductions/UXP/pulls/2320
Diffstat (limited to 'media')
-rw-r--r-- | media/libvpx/vp8/encoder/onyx_if.c | 4 |
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) |