From b7371de345a0ed95c9f5e6a78d73229a3564e85b Mon Sep 17 00:00:00 2001 From: happyworker <208suo@208suo.com> Date: Tue, 9 Jul 2024 11:28:22 +0800 Subject: [PATCH] sync openEuler-20.03-LTS-SP1 to openEuler-22.03-LTS-SP4 --- CVE-2020-35964.patch | 4 ++-- CVE-2021-38114.patch | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CVE-2020-35964.patch b/CVE-2020-35964.patch index 7840f27..21c0b6c 100644 --- a/CVE-2020-35964.patch +++ b/CVE-2020-35964.patch @@ -1,6 +1,6 @@ diff -Naru ffmpeg-4.2.4/libavformat/vividas.c ffmpeg-4.2.4-new/libavformat/vividas.c ---- ffmpeg-4.2.4/libavformat/vividas.c 2022-05-24 10:57:25.967425000 +0800 -+++ ffmpeg-4.2.4-new/libavformat/vividas.c 2022-05-24 11:07:17.698072000 +0800 +--- ffmpeg-4.2.4/libavformat/vividas.c 2022-05-24 14:52:47.185857000 +0800 ++++ ffmpeg-4.2.4-new/libavformat/vividas.c 2022-05-24 15:16:15.926505000 +0800 @@ -27,7 +27,7 @@ * @author Andrzej Szombierski [qq at kuku eu org] (2010-07) * @sa http://wiki.multimedia.cx/index.php?title=Vividas_VIV diff --git a/CVE-2021-38114.patch b/CVE-2021-38114.patch index 5477bea..dc56b0e 100644 --- a/CVE-2021-38114.patch +++ b/CVE-2021-38114.patch @@ -1,6 +1,6 @@ diff -Naru ffmpeg-4.2.4/libavcodec/dnxhddec.c ffmpeg-4.2.4-new/libavcodec/dnxhddec.c ---- ffmpeg-4.2.4/libavcodec/dnxhddec.c 2022-05-24 10:57:19.937425000 +0800 -+++ ffmpeg-4.2.4-new/libavcodec/dnxhddec.c 2022-05-24 10:59:49.141810000 +0800 +--- ffmpeg-4.2.4/libavcodec/dnxhddec.c 2022-05-24 14:52:38.305857000 +0800 ++++ ffmpeg-4.2.4-new/libavcodec/dnxhddec.c 2022-05-24 15:13:34.231494000 +0800 @@ -111,6 +111,7 @@ static int dnxhd_init_vlc(DNXHDContext *ctx, uint32_t cid, int bitdepth)