summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDivyanshu Rathore <divyanshurathore2022@gmail.com>2025-05-21 13:29:45 +0530
committerSteve Sakoman <steve@sakoman.com>2025-06-02 07:12:34 -0700
commit51ae2b0ed0e9ec9bad7c529bc899fdb6cb9a8aa6 (patch)
treeae8684a96ee95545e2a1f5a2f500165149342798
parent4d40c0f3553418b2260295f16205d4b111424404 (diff)
downloadpoky-51ae2b0ed0e9ec9bad7c529bc899fdb6cb9a8aa6.tar.gz
ffmpeg: upgrade 6.1.1 -> 6.1.2
ffmpeg_6.1.2 is the newest available stable release for 6.1. It introduces quite a few bug and CVE fixes, which should help all. CVEs that are fixed in the upgrade: CVE-2024-32230 CVE-2024-35366 CVE-2024-36613 CVE-2024-36616 CVE-2024-36617 CVE-2024-36619 CVE-2024-7055 During upgrade it was noticed that the CVE scan doesn't pick up the CVEs as unpatched (CVE-2025-0518, CVE-2025-22919, CVE-2025-22921, CVE-2025-25473, CVE-2024-36618, CVE-2024-35369, CVE-2024-35368, CVE-2024-35367, CVE-2024-35365, CVE-2024-28661, CVE-2023-50007, CVE-2023-49528, CVE-2023-49501), due to improper versioning in NVD, they are affecting 6.1.2 and hence we are leaving the patches in. check the changelog mention below for information about fixes. changelog: https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n6.1.2 This upgrade fixes CVE's hence remove those patches. Refresh vulkan_av1_stable_API.patch as per new codebase. (From OE-Core rev: 57e25585abf34677451c68d581374245e5b4b418) Signed-off-by: Divyanshu Rathore <divyanshurathore2022@gmail.com> Signed-off-by: Steve Sakoman <steve@sakoman.com>
Diffstat
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch36
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch35
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch37
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch35
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch36
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch36
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch38
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch40
-rw-r--r--meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.2.bb (renamed from meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb)9
9 files changed, 21 insertions, 281 deletions
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch
deleted file mode 100644
index 0f30c9ecf5..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-32230.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michael@niedermayer.cc>
3Date: Mon, 8 Apr 2024 18:38:42 +0200
4Subject: [PATCH] avcodec/mpegvideo_enc: Fix 1 line and one column images
5
6Fixes: Ticket10952
7Fixes: poc21ffmpeg
8Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
9
10CVE: CVE-2024-32230
11
12Upstream-Status: Backport [https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1]
13
14Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
15---
16 libavcodec/mpegvideo_enc.c | 4 ++--
17 1 file changed, 2 insertions(+), 2 deletions(-)
18
19diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c
20index e460ca4..fb4aaa2 100644
21--- a/libavcodec/mpegvideo_enc.c
22+++ b/libavcodec/mpegvideo_enc.c
23@@ -1198,8 +1198,8 @@ static int load_input_picture(MpegEncContext *s, const AVFrame *pic_arg)
24 int dst_stride = i ? s->uvlinesize : s->linesize;
25 int h_shift = i ? s->chroma_x_shift : 0;
26 int v_shift = i ? s->chroma_y_shift : 0;
27- int w = s->width >> h_shift;
28- int h = s->height >> v_shift;
29+ int w = AV_CEIL_RSHIFT(s->width , h_shift);
30+ int h = AV_CEIL_RSHIFT(s->height, v_shift);
31 const uint8_t *src = pic_arg->data[i];
32 uint8_t *dst = pic->f->data[i];
33 int vpad = 16;
34--
352.40.0
36
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch
deleted file mode 100644
index f7f16a5b92..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-35366.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 0bed22d597b78999151e3bde0768b7fe763fc2a6 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michael@niedermayer.cc>
3Date: Tue, 26 Mar 2024 00:39:49 +0100
4Subject: [PATCH] avformat/sbgdec: Check for negative duration
5
6Fixes: signed integer overflow: 9223372036854775807 - -8000000 cannot be represented in type 'long'
7Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_SBG_fuzzer-5133181743136768
8
9Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
10Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
11
12CVE: CVE-2024-35366
13
14Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/0bed22d597b78999151e3bde0768b7fe763fc2a6]
15
16Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
17---
18 libavformat/sbgdec.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/libavformat/sbgdec.c b/libavformat/sbgdec.c
22index b2662ea..281fe62 100644
23--- a/libavformat/sbgdec.c
24+++ b/libavformat/sbgdec.c
25@@ -386,7 +386,7 @@ static int parse_options(struct sbg_parser *p)
26 case 'L':
27 FORWARD_ERROR(parse_optarg(p, opt, &oarg));
28 r = str_to_time(oarg.s, &p->scs.opt_duration);
29- if (oarg.e != oarg.s + r) {
30+ if (oarg.e != oarg.s + r || p->scs.opt_duration < 0) {
31 snprintf(p->err_msg, sizeof(p->err_msg),
32 "syntax error for option -L");
33 return AVERROR_INVALIDDATA;
34--
352.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch
deleted file mode 100644
index 0061b7ad98..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36613.patch
+++ /dev/null
@@ -1,37 +0,0 @@
1From 50d8e4f27398fd5778485a827d7a2817921f8540 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michael@niedermayer.cc>
3Date: Sat, 30 Sep 2023 00:51:29 +0200
4Subject: [PATCH] avformat/dxa: Adjust order of operations around block align
5
6Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_DXA_fuzzer-5730576523198464
7Fixes: signed integer overflow: 2147483566 + 82 cannot be represented in type 'int'
8
9Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
10Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
11(cherry picked from commit 50d8e4f27398fd5778485a827d7a2817921f8540)
12Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
13
14CVE: CVE-2024-36613
15
16Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/50d8e4f27398fd5778485a827d7a2817921f8540]
17
18Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
19---
20 libavformat/dxa.c | 2 +-
21 1 file changed, 1 insertion(+), 1 deletion(-)
22
23diff --git a/libavformat/dxa.c b/libavformat/dxa.c
24index 474b852..b4d9d00 100644
25--- a/libavformat/dxa.c
26+++ b/libavformat/dxa.c
27@@ -122,7 +122,7 @@ static int dxa_read_header(AVFormatContext *s)
28 if(ast->codecpar->block_align) {
29 if (c->bpc > INT_MAX - ast->codecpar->block_align + 1)
30 return AVERROR_INVALIDDATA;
31- c->bpc = ((c->bpc + ast->codecpar->block_align - 1) / ast->codecpar->block_align) * ast->codecpar->block_align;
32+ c->bpc = ((c->bpc - 1 + ast->codecpar->block_align) / ast->codecpar->block_align) * ast->codecpar->block_align;
33 }
34 c->bytes_left = fsize;
35 c->wavpos = avio_tell(pb);
36--
372.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch
deleted file mode 100644
index 3f02c45b33..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36616.patch
+++ /dev/null
@@ -1,35 +0,0 @@
1From 86f73277bf014e2ce36dd2594f1e0fb8b3bd6661 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michael@niedermayer.cc>
3Date: Tue, 26 Mar 2024 01:00:13 +0100
4Subject: [PATCH] avformat/westwood_vqa: Fix 2g packets
5
6Fixes: signed integer overflow: 2147483424 * 2 cannot be represented in type 'int'
7Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_WSVQA_fuzzer-4576211411795968
8
9Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
10Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
11
12CVE: CVE-2024-36616
13
14Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/86f73277bf014e2ce36dd2594f1e0fb8b3bd6661]
15
16Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
17---
18 libavformat/westwood_vqa.c | 2 +-
19 1 file changed, 1 insertion(+), 1 deletion(-)
20
21diff --git a/libavformat/westwood_vqa.c b/libavformat/westwood_vqa.c
22index 03b2d9e..024f5d3 100644
23--- a/libavformat/westwood_vqa.c
24+++ b/libavformat/westwood_vqa.c
25@@ -262,7 +262,7 @@ static int wsvqa_read_packet(AVFormatContext *s,
26 break;
27 case SND2_TAG:
28 /* 2 samples/byte, 1 or 2 samples per frame depending on stereo */
29- pkt->duration = (chunk_size * 2) / wsvqa->channels;
30+ pkt->duration = (chunk_size * 2LL) / wsvqa->channels;
31 break;
32 }
33 break;
34--
352.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch
deleted file mode 100644
index 5d751213e3..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36617.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From d973fcbcc2f944752ff10e6a76b0b2d9329937a7 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michael@niedermayer.cc>
3Date: Sat, 30 Sep 2023 00:38:17 +0200
4Subject: [PATCH] avformat/cafdec: dont seek beyond 64bit
5
6Fixes: signed integer overflow: 64 + 9223372036854775807 cannot be represented in type 'long long'
7Fixes: 51896/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
8Fixes: 62276/clusterfuzz-testcase-minimized-ffmpeg_dem_CAF_fuzzer-6418242730328064
9
10Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
11Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12
13CVE: CVE-2024-36617
14
15Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/d973fcbcc2f944752ff10e6a76b0b2d9329937a7]
16
17Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
18---
19 libavformat/cafdec.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/libavformat/cafdec.c b/libavformat/cafdec.c
23index f5ba0f4..e92e327 100644
24--- a/libavformat/cafdec.c
25+++ b/libavformat/cafdec.c
26@@ -271,7 +271,7 @@ static int read_pakt_chunk(AVFormatContext *s, int64_t size)
27 }
28 }
29
30- if (avio_tell(pb) - ccount > size) {
31+ if (avio_tell(pb) - ccount > size || size > INT64_MAX - ccount) {
32 av_log(s, AV_LOG_ERROR, "error reading packet table\n");
33 return AVERROR_INVALIDDATA;
34 }
35--
362.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch
deleted file mode 100644
index 63d08eabcc..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-36619.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From 28c7094b25b689185155a6833caf2747b94774a4 Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michael@niedermayer.cc>
3Date: Thu, 4 Apr 2024 00:15:27 +0200
4Subject: [PATCH] avcodec/wavarc: fix signed integer overflow in block type
5 6/19
6
7Fixes: signed integer overflow: -2088796289 + -91276551 cannot be represented in type 'int'
8Fixes: 67772/clusterfuzz-testcase-minimized-ffmpeg_AV_CODEC_ID_WAVARC_fuzzer-6533568953122816
9
10Found-by: continuous fuzzing process https://github.com/google/oss-fuzz/tree/master/projects/ffmpeg
11Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12
13CVE: CVE-2024-36619
14
15Upstream-Status: Backport [https://github.com/ffmpeg/ffmpeg/commit/28c7094b25b689185155a6833caf2747b94774a4]
16
17Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
18---
19 libavcodec/wavarc.c | 2 +-
20 1 file changed, 1 insertion(+), 1 deletion(-)
21
22diff --git a/libavcodec/wavarc.c b/libavcodec/wavarc.c
23index 09ed4d4..51d91a4 100644
24--- a/libavcodec/wavarc.c
25+++ b/libavcodec/wavarc.c
26@@ -648,7 +648,7 @@ static int decode_5elp(AVCodecContext *avctx,
27 for (int o = 0; o < order; o++)
28 sum += s->filter[ch][o] * (unsigned)samples[n + 70 - o - 1];
29
30- samples[n + 70] += ac_out[n] + (sum >> 4);
31+ samples[n + 70] += ac_out[n] + (unsigned)(sum >> 4);
32 }
33
34 for (int n = 0; n < 70; n++)
35--
362.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch
deleted file mode 100644
index afd857ceac..0000000000
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2024-7055.patch
+++ /dev/null
@@ -1,38 +0,0 @@
1From 587acd0d4020859e67d1f07aeff2c885797ebcce Mon Sep 17 00:00:00 2001
2From: Michael Niedermayer <michael@niedermayer.cc>
3Date: Thu, 18 Jul 2024 21:12:54 +0200
4Subject: [PATCH] avcodec/pnmdec: Use 64bit for input size check
5
6Fixes: out of array read
7Fixes: poc3
8
9Reported-by: VulDB CNA Team
10Found-by: CookedMelon
11Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
12(cherry picked from commit 3faadbe2a27e74ff5bb5f7904ec27bb1f5287dc8)
13Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
14
15CVE: CVE-2024-7055
16
17Upstream-Status: Backport [https://git.videolan.org/?p=ffmpeg.git;a=commitdiff;h=587acd0d4020859e67d1f07aeff2c885797ebcce]
18
19Signed-off-by: Archana Polampalli <archana.polampalli@windriver.com>
20---
21 libavcodec/pnmdec.c | 2 +-
22 1 file changed, 1 insertion(+), 1 deletion(-)
23
24diff --git a/libavcodec/pnmdec.c b/libavcodec/pnmdec.c
25index acd77ea..40cc2ae 100644
26--- a/libavcodec/pnmdec.c
27+++ b/libavcodec/pnmdec.c
28@@ -264,7 +264,7 @@ static int pnm_decode_frame(AVCodecContext *avctx, AVFrame *p,
29 break;
30 case AV_PIX_FMT_GBRPF32:
31 if (!s->half) {
32- if (avctx->width * avctx->height * 12 > s->bytestream_end - s->bytestream)
33+ if (avctx->width * avctx->height * 12LL > s->bytestream_end - s->bytestream)
34 return AVERROR_INVALIDDATA;
35 scale = 1.f / s->scale;
36 if (s->endian) {
37--
382.40.0
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
index 74db148b3b..be6c6b7416 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg/vulkan_av1_stable_API.patch
@@ -6,6 +6,9 @@ Subject: [PATCH] vulkan_av1: port to the new stable API
6Co-Authored-by: Dave Airlie <airlied@redhat.com> 6Co-Authored-by: Dave Airlie <airlied@redhat.com>
7Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> 7Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
8Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295] 8Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commitdiff/ecdc94b97f809d5f2b88640842fd0541951ad295]
9
10Comment: Patch is refreshed as per codebase of 6.1.2
11Signed-off-by: Divyanshu Rathore <divyanshu.rathore@kpit.com>
9--- 12---
10 configure | 4 +- 13 configure | 4 +-
11 libavcodec/Makefile | 5 +- 14 libavcodec/Makefile | 5 +-
@@ -26,7 +29,7 @@ diff --git a/configure b/configure
26index e853deb51d..9fa639fca6 100755 29index e853deb51d..9fa639fca6 100755
27--- a/configure 30--- a/configure
28+++ b/configure 31+++ b/configure
29@@ -7300,8 +7300,8 @@ enabled vdpau && 32@@ -7160,8 +7160,8 @@ enabled crystalhd && check_lib crystalhd
30 "in maintaining it." 33 "in maintaining it."
31 34
32 if enabled vulkan; then 35 if enabled vulkan; then
@@ -41,21 +44,19 @@ diff --git a/libavcodec/Makefile b/libavcodec/Makefile
41index 7ef2e03ca6..9ce6d445c1 100644 44index 7ef2e03ca6..9ce6d445c1 100644
42--- a/libavcodec/Makefile 45--- a/libavcodec/Makefile
43+++ b/libavcodec/Makefile 46+++ b/libavcodec/Makefile
44@@ -1258,8 +1258,7 @@ SKIPHEADERS += %_tablegen.h \ 47@@ -1284,7 +1284,6 @@ SKIPHEADERS +
45 aacenc_quantization.h \ 48 aacenc_quantization.h \
46 aacenc_quantization_misc.h \ 49 aacenc_quantization_misc.h \
47 bitstream_template.h \ 50 bitstream_template.h \
48- vulkan_video_codec_av1std.h \ 51- vulkan_video_codec_av1std_mesa.h \
49- $(ARCH)/vpx_arith.h \ 52 $(ARCH)/vpx_arith.h \
50+ $(ARCH)/vpx_arith.h \
51 53
52 SKIPHEADERS-$(CONFIG_AMF) += amfenc.h 54 SKIPHEADERS-$(CONFIG_AMF) += amfenc.h
53 SKIPHEADERS-$(CONFIG_D3D11VA) += d3d11va.h dxva2_internal.h 55@@ -1306,7 +1305,7 @@ SKIPHEADERS-$(CONFIG_XVMC) +
54@@ -1280,7 +1279,7 @@ SKIPHEADERS-$(CONFIG_QSVENC) += qsvenc.h
55 SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h 56 SKIPHEADERS-$(CONFIG_VAAPI) += vaapi_decode.h vaapi_hevc.h vaapi_encode.h
56 SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h 57 SKIPHEADERS-$(CONFIG_VDPAU) += vdpau.h vdpau_internal.h
57 SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h 58 SKIPHEADERS-$(CONFIG_VIDEOTOOLBOX) += videotoolbox.h vt_internal.h
58-SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode.h 59-SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h vulkan_video_codec_av1std_decode_mesa.h
59+SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h 60+SKIPHEADERS-$(CONFIG_VULKAN) += vulkan.h vulkan_video.h vulkan_decode.h
60 SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h 61 SKIPHEADERS-$(CONFIG_V4L2_M2M) += v4l2_buffers.h v4l2_context.h v4l2_m2m.h
61 SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h 62 SKIPHEADERS-$(CONFIG_ZLIB) += zlib_wrapper.h
@@ -866,19 +867,19 @@ diff --git a/libavcodec/vulkan_video.h b/libavcodec/vulkan_video.h
866index bb69e920bb..01a1de7d9d 100644 867index bb69e920bb..01a1de7d9d 100644
867--- a/libavcodec/vulkan_video.h 868--- a/libavcodec/vulkan_video.h
868+++ b/libavcodec/vulkan_video.h 869+++ b/libavcodec/vulkan_video.h
869@@ -22,8 +22,6 @@ 870@@ -23,8 +23,6 @@
870 #include "vulkan.h" 871 #include "vulkan.h"
871 872
872 #include <vk_video/vulkan_video_codecs_common.h> 873 #include <vk_video/vulkan_video_codecs_common.h>
873-#include "vulkan_video_codec_av1std.h" 874-#include "vulkan_video_codec_av1std_mesa.h"
874-#include "vulkan_video_codec_av1std_decode.h" 875-#include "vulkan_video_codec_av1std_decode_mesa.h"
875 876
876 #define CODEC_VER_MAJ(ver) (ver >> 22) 877 #define CODEC_VER_MAJ(ver) (ver >> 22)
877 #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1)) 878 #define CODEC_VER_MIN(ver) ((ver >> 12) & ((1 << 10) - 1))
878diff --git a/libavcodec/vulkan_video_codec_av1std_decode.h b/libavcodec/vulkan_video_codec_av1std_decode.h 879diff --git a/libavcodec/vulkan_video_codec_av1std_decode_mesa.h b/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
879deleted file mode 100644 880deleted file mode 100644
880index e2f37b4e6e..0000000000 881index e2f37b4e6e..0000000000
881--- a/libavcodec/vulkan_video_codec_av1std_decode.h 882--- a/libavcodec/vulkan_video_codec_av1std_decode_mesa.h
882+++ /dev/null 883+++ /dev/null
883@@ -1,36 +0,0 @@ 884@@ -1,36 +0,0 @@
884-/* Copyright 2023 Lynne 885-/* Copyright 2023 Lynne
@@ -897,8 +898,8 @@ index e2f37b4e6e..0000000000
897- * limitations under the License. 898- * limitations under the License.
898- */ 899- */
899- 900-
900-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 901-#ifndef VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_
901-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_H_ 1 902-#define VULKAN_VIDEO_CODEC_AV1STD_DECODE_MESA_H_ 1
902- 903-
903-/* 904-/*
904-** This header is NOT YET generated from the Khronos Vulkan XML API Registry. 905-** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
@@ -917,10 +918,10 @@ index e2f37b4e6e..0000000000
917-#endif 918-#endif
918- 919-
919-#endif 920-#endif
920diff --git a/libavcodec/vulkan_video_codec_av1std.h b/libavcodec/vulkan_video_codec_av1std.h 921diff --git a/libavcodec/vulkan_video_codec_av1std_mesa.h b/libavcodec/vulkan_video_codec_av1std_mesa.h
921deleted file mode 100644 922deleted file mode 100644
922index c91589eee2..0000000000 923index c91589eee2..0000000000
923--- a/libavcodec/vulkan_video_codec_av1std.h 924--- a/libavcodec/vulkan_video_codec_av1std_mesa.h
924+++ /dev/null 925+++ /dev/null
925@@ -1,403 +0,0 @@ 926@@ -1,403 +0,0 @@
926-/* Copyright 2023 Lynne 927-/* Copyright 2023 Lynne
@@ -939,8 +940,8 @@ index c91589eee2..0000000000
939- * limitations under the License. 940- * limitations under the License.
940- */ 941- */
941- 942-
942-#ifndef VULKAN_VIDEO_CODEC_AV1STD_H_ 943-#ifndef VULKAN_VIDEO_CODEC_AV1STD_MESA_H_
943-#define VULKAN_VIDEO_CODEC_AV1STD_H_ 1 944-#define VULKAN_VIDEO_CODEC_AV1STD_MESA_H_ 1
944- 945-
945-/* 946-/*
946-** This header is NOT YET generated from the Khronos Vulkan XML API Registry. 947-** This header is NOT YET generated from the Khronos Vulkan XML API Registry.
@@ -1379,4 +1380,3 @@ diff --git a/libavcodec/vulkan_video.c b/libavcodec/vulkan_video.c
1379 1380
1380-- 1381--
13812.25.1 13822.25.1
1382
diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.2.bb
index 3d766c3fc7..04356b9932 100644
--- a/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.1.bb
+++ b/meta/recipes-multimedia/ffmpeg/ffmpeg_6.1.2.bb
@@ -31,21 +31,14 @@ SRC_URI = " \
31 file://CVE-2024-31578.patch \ 31 file://CVE-2024-31578.patch \
32 file://CVE-2024-31582.patch \ 32 file://CVE-2024-31582.patch \
33 file://CVE-2023-50008.patch \ 33 file://CVE-2023-50008.patch \
34 file://CVE-2024-32230.patch \
35 file://CVE-2023-49501.patch \ 34 file://CVE-2023-49501.patch \
36 file://CVE-2024-28661.patch \ 35 file://CVE-2024-28661.patch \
37 file://CVE-2023-50007.patch \ 36 file://CVE-2023-50007.patch \
38 file://CVE-2023-49528.patch \ 37 file://CVE-2023-49528.patch \
39 file://CVE-2024-7055.patch \
40 file://CVE-2024-35366.patch \
41 file://CVE-2024-35367.patch \ 38 file://CVE-2024-35367.patch \
42 file://CVE-2024-35368.patch \ 39 file://CVE-2024-35368.patch \
43 file://CVE-2024-35365.patch \ 40 file://CVE-2024-35365.patch \
44 file://CVE-2024-36613.patch \
45 file://CVE-2024-36616.patch \
46 file://CVE-2024-36617.patch \
47 file://CVE-2024-36618.patch \ 41 file://CVE-2024-36618.patch \
48 file://CVE-2024-36619.patch \
49 file://CVE-2024-35369.patch \ 42 file://CVE-2024-35369.patch \
50 file://CVE-2025-25473.patch \ 43 file://CVE-2025-25473.patch \
51 file://CVE-2025-22919.patch \ 44 file://CVE-2025-22919.patch \
@@ -53,7 +46,7 @@ SRC_URI = " \
53 file://CVE-2025-0518.patch \ 46 file://CVE-2025-0518.patch \
54" 47"
55 48
56SRC_URI[sha256sum] = "8684f4b00f94b85461884c3719382f1261f0d9eb3d59640a1f4ac0873616f968" 49SRC_URI[sha256sum] = "3b624649725ecdc565c903ca6643d41f33bd49239922e45c9b1442c63dca4e38"
57 50
58# https://nvd.nist.gov/vuln/detail/CVE-2023-39018 51# https://nvd.nist.gov/vuln/detail/CVE-2023-39018
59# https://github.com/bramp/ffmpeg-cli-wrapper/issues/291 52# https://github.com/bramp/ffmpeg-cli-wrapper/issues/291
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-06-14 12:29:27 +0000