diff --git a/_scmsync.obsinfo b/_scmsync.obsinfo index d020f1b..7fe3c97 100644 --- a/_scmsync.obsinfo +++ b/_scmsync.obsinfo @@ -1,4 +1,4 @@ -mtime: 1722848252 -commit: 8c17f41823d4600460b89dd35ff0365d154e30b5ae64f6d51ca6e5862223987c +mtime: 1723277105 +commit: 62e69514f7630d78d61eaba08f38722630b84b1cd4a21f572e09cb0b26d8249d url: https://src.opensuse.org/jengelh/ffmpeg-7 revision: master diff --git a/build.specials.obscpio b/build.specials.obscpio index d733dba..e5878b9 100644 --- a/build.specials.obscpio +++ b/build.specials.obscpio @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:726930aaefbd6951fbdf48da5dba714f1165151d50e8d3567a5fb4cd6256110b +oid sha256:bbbe70dceb56f3b2613ab3df8bd9310c0e9282365a8a27434d16bce808cc1663 size 256 diff --git a/ffmpeg-7-CVE-2024-32228.patch b/ffmpeg-7-CVE-2024-32228.patch deleted file mode 100644 index 9b09e54..0000000 --- a/ffmpeg-7-CVE-2024-32228.patch +++ /dev/null @@ -1,54 +0,0 @@ -From 459648761f5412acdc3317d5bac982ceaa257584 -Author: Niklas Haas -Date: Sat Apr 6 13:11:09 2024 +0200 -Subject: avcodec/hevcdec: fix segfault on invalid film grain metadata -References: CVE-2024-32228 -References: https://bugzilla.opensuse.org/1227277 -Upstream: Backport from upstream - -Invalid input files may contain film grain metadata which survives -ff_h274_film_grain_params_supported() but does not pass -av_film_grain_params_select(), leading to a SIGSEGV on hevc_frame_end(). - -Fix this by duplicating the av_film_grain_params_select() check at frame -init time. - -An alternative solution here would be to defer the incompatibility check -to hevc_frame_end(), but this has the downside of allocating a film -grain buffer even when we already know we can't apply film grain. - -Fixes: https://trac.ffmpeg.org/ticket/10951 - ---- ffmpeg-7.0/libavcodec/hevcdec.c -+++ ffmpeg-7.0_new/libavcodec/hevcdec.c -@@ -2892,10 +2892,16 @@ - !(s->avctx->export_side_data & AV_CODEC_EXPORT_DATA_FILM_GRAIN) && - !s->avctx->hwaccel; - -+ ret = set_side_data(s); -+ if (ret < 0) -+ goto fail; -+ - if (s->ref->needs_fg && -- s->sei.common.film_grain_characteristics.present && -- !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, -- s->ref->frame->format)) { -+ ( s->sei.common.film_grain_characteristics.present && -+ !ff_h274_film_grain_params_supported(s->sei.common.film_grain_characteristics.model_id, -+ s->ref->frame->format)) -+ || !av_film_grain_params_select(s->ref->frame)) { -+ - av_log_once(s->avctx, AV_LOG_WARNING, AV_LOG_DEBUG, &s->film_grain_warning_shown, - "Unsupported film grain parameters. Ignoring film grain.\n"); - s->ref->needs_fg = 0; -@@ -2909,10 +2915,6 @@ - goto fail; - } - -- ret = set_side_data(s); -- if (ret < 0) -- goto fail; -- - s->frame->pict_type = 3 - s->sh.slice_type; - - if (!IS_IRAP(s)) diff --git a/ffmpeg-7-CVE-2024-32229.patch b/ffmpeg-7-CVE-2024-32229.patch deleted file mode 100644 index 1291d7f..0000000 --- a/ffmpeg-7-CVE-2024-32229.patch +++ /dev/null @@ -1,38 +0,0 @@ -From a528a54ee119dcba47e7c9e30d3a56206fbad416 Mon Sep 17 00:00:00 2001 -From: James Almer -Date: Thu, 4 Jul 2024 14:55:23 -0300 -Subject: [PATCH] avfilter/vf_tiltandshift: fix buffer offset for yuv422p input - -Fixes ticket #10950. - -Signed-off-by: James Almer ---- - libavfilter/vf_tiltandshift.c | 8 ++++---- - 1 file changed, 4 insertions(+), 4 deletions(-) - -diff --git a/libavfilter/vf_tiltandshift.c b/libavfilter/vf_tiltandshift.c -index 85cce84fc3..b49a713339 100644 ---- a/libavfilter/vf_tiltandshift.c -+++ b/libavfilter/vf_tiltandshift.c -@@ -175,14 +175,14 @@ static void copy_column(AVFilterLink *outlink, - const uint8_t *src[4]; - - dst[0] = dst_data[0] + ncol; -- dst[1] = dst_data[1] + (ncol >> s->desc->log2_chroma_h); -- dst[2] = dst_data[2] + (ncol >> s->desc->log2_chroma_h); -+ dst[1] = dst_data[1] + (ncol >> s->desc->log2_chroma_w); -+ dst[2] = dst_data[2] + (ncol >> s->desc->log2_chroma_w); - - if (!tilt) - ncol = 0; - src[0] = src_data[0] + ncol; -- src[1] = src_data[1] + (ncol >> s->desc->log2_chroma_h); -- src[2] = src_data[2] + (ncol >> s->desc->log2_chroma_h); -+ src[1] = src_data[1] + (ncol >> s->desc->log2_chroma_w); -+ src[2] = src_data[2] + (ncol >> s->desc->log2_chroma_w); - - av_image_copy(dst, dst_linesizes, src, src_linesizes, outlink->format, 1, outlink->h); - } --- -2.41.0 - diff --git a/ffmpeg-7-CVE-2024-32230.patch b/ffmpeg-7-CVE-2024-32230.patch deleted file mode 100644 index f36951e..0000000 --- a/ffmpeg-7-CVE-2024-32230.patch +++ /dev/null @@ -1,25 +0,0 @@ -From 96449cfeaeb95fcfd7a2b8d9ccf7719e97471ed1 -Author: Michael Niedermayer -Date: Mon Apr 8 18:38:42 2024 +0200 -Subject: avcodec/mpegvideo_enc: Fix 1 line and one column images -References: CVE-2024-32230 -References: https://bugzilla.opensuse.org/1227296 -Upstream: Backport from upstream - -Fixes: Ticket10952 -Fixes: poc21ffmpeg -Signed-off-by: Michael Niedermayer - ---- ffmpeg-7.0/libavcodec/mpegvideo_enc.c -+++ ffmpeg-7.0_new/libavcodec/mpegvideo_enc.c -@@ -1198,8 +1198,8 @@ - ptrdiff_t dst_stride = i ? s->uvlinesize : s->linesize; - int h_shift = i ? s->chroma_x_shift : 0; - int v_shift = i ? s->chroma_y_shift : 0; -- int w = s->width >> h_shift; -- int h = s->height >> v_shift; -+ int w = AV_CEIL_RSHIFT(s->width , h_shift); -+ int h = AV_CEIL_RSHIFT(s->height, v_shift); - const uint8_t *src = pic_arg->data[i]; - uint8_t *dst = pic->f->data[i]; - int vpad = 16; diff --git a/ffmpeg-7.0.2.tar.xz b/ffmpeg-7.0.2.tar.xz new file mode 100644 index 0000000..7cf458c --- /dev/null +++ b/ffmpeg-7.0.2.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:8646515b638a3ad303e23af6a3587734447cb8fc0a0c064ecdb8e95c4fd8b389 +size 10795332 diff --git a/ffmpeg-7.0.2.tar.xz.asc b/ffmpeg-7.0.2.tar.xz.asc new file mode 100644 index 0000000..3796f14 --- /dev/null +++ b/ffmpeg-7.0.2.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- + +iQFMBAABCgA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmatZQYYHGZmbXBlZy1k +ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYIlcIAKF1VWqnhhKkBHSxEnH8ipUH +nlJmPitKaJTwgtAtHGH8DL4XlgUwxfws9YohJ6V2fz/LjD+4rcU1BB9lMKNTaEW3 +g27lIRHXC571OGgBKJFadhsbULtUu9oUOIcqS28zOl3fsok/G7NVd3ajkpiRUPhu +LRXUXNbCIwtXbIdS0yECpiRcHMj/hX6nkY3yHrmWXAts/TtmIQyaNTbnC4ervA1s +Ijc4cY/unb6OD9DpmC6DznVykyfzc2GjjCiNxRXrljp+MaZ7jBEMwjXfOIATwBwj +gCN+N6nlxc5e3gMOGcAJy93iD9HpbgVDAn6S6jnB/z5+Tyv6ZeP+sytsgOCNjlQ= +=R372 +-----END PGP SIGNATURE----- diff --git a/ffmpeg-7.0.tar.xz b/ffmpeg-7.0.tar.xz deleted file mode 100644 index ba44487..0000000 --- a/ffmpeg-7.0.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:4426a94dd2c814945456600c8adfc402bee65ec14a70e8c531ec9a2cd651da7b -size 10791240 diff --git a/ffmpeg-7.0.tar.xz.asc b/ffmpeg-7.0.tar.xz.asc deleted file mode 100644 index 582f690..0000000 --- a/ffmpeg-7.0.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- - -iQFMBAABCAA2FiEE/PmG6hXm4pOlZE8QtDIvBNZ2WNgFAmYPNtMYHGZmbXBlZy1k -ZXZlbEBmZm1wZWcub3JnAAoJELQyLwTWdljYFdUIAIOFgLplbe7CHY0G3bQuCK8N -Q+js2eLPxKNbeBhshcHDyNResAT+uHE7fQYRFUcETf5qqoPHyDptbG/o+onlGW8M -vNwu6wTC3XiFjKjJKBRwyXYS31J+R/re2w+LiEI+OnekRhaQ/vbj1bbjREEQLtOv -7086Oc6ZzMAsxjc6wGde4eJkhTQT8HYF6lU0Bsm4yeqCAcppfGv6OwZn8fyQ/L9i -PaqFJFzs4C8PdRRdSQ7VifAcAAmyHNoRY611ZCbnJvoc7oEU44SVIKsryqRBunoX -aAZ1eNwoI/Oz/uC/yK+S3oaAauZuUZFxgc0hqCxYLZF5TeRvF4Y8cPTTymTuVDM= -=Hz9R ------END PGP SIGNATURE----- diff --git a/ffmpeg-7.changes b/ffmpeg-7.changes index 2ec2c96..a39a81d 100644 --- a/ffmpeg-7.changes +++ b/ffmpeg-7.changes @@ -1,3 +1,35 @@ +------------------------------------------------------------------- +Wed Aug 7 07:37:24 UTC 2024 - Cliff Zhao + +- Update to version 7.0.2: + * avcodec/snow: Fix off by 1 error in run_buffer + * avcodec/utils: apply the same alignment to YUV410 as we do to YUV420 for snow + * avformat/iamf_parse: Check for 0 samples + * swscale: [loongarch] Fix checkasm-sw_yuv2rgb failure. + * avcodec/aacps_tablegen_template: don't redefine CONFIG_HARDCODED_TABLES + * avutil/hwcontext_vaapi: use the correct type for VASurfaceAttribExternalBuffers.buffers + * avcodec/pcm-bluray/dvd: Use correct pointer types on BE + * avcodec/pngenc: fix sBIT writing for indexed-color PNGs + * avcodec/pngdec: use 8-bit sBIT cap for indexed PNGs per spec + * avformat/mov: check that child boxes of trak are only present inside it + * avformat/mov: check that sample and chunk count is 1 for HEIF + * avcodec/videotoolboxenc: Fix bitrate doesn't work as expected + * avdevice/dshow: Don't skip audio devices if no video device is present + * avcodec/hdrenc: Allocate more space + * avcodec/cfhdenc: Height of 16 is not supported + * avcodec/cfhdenc: Allocate more space + * avcodec/osq: fix integer overflow when applying factor + * avcodec/osq: avoid using too large numbers for shifts and integers in update_residue_parameter() + * avcodec/hevcdec: fix segfault on invalid film grain metadata (CVE-2024-32228, bsc#1227277) + * avfilter/vf_tiltandshift: fix buffer offset for yuv422p input (CVE-2024-32229, bsc#1227295) + * avcodec/mpegvideo_enc: Fix 1 line and one column images (CVE-2024-32230, bsc#1227296) +- Drop ffmpeg-7-CVE-2024-32228.patch: + The fix has been merged. +- Drop ffmpeg-7-CVE-2024-32229.patch: + The fix has been merged. +- Drop ffmpeg-7-CVE-2024-32230.patch: + The fix has been merged. + ------------------------------------------------------------------- Sat Aug 3 08:52:26 UTC 2024 - Cliff Zhao diff --git a/ffmpeg-7.spec b/ffmpeg-7.spec index d554c6b..c43e3a8 100644 --- a/ffmpeg-7.spec +++ b/ffmpeg-7.spec @@ -86,7 +86,7 @@ %define _major_expected 8 Name: ffmpeg-7 -Version: 7.0 +Version: 7.0.2 Release: 0 Summary: Set of libraries for working with various multimedia formats License: GPL-3.0-or-later @@ -109,9 +109,6 @@ Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch Patch5: work-around-abi-break.patch Patch10: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch -Patch92: ffmpeg-7-CVE-2024-32228.patch -Patch93: ffmpeg-7-CVE-2024-32230.patch -Patch94: ffmpeg-7-CVE-2024-32229.patch Patch95: ffmpeg-7-fix-crashes.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel @@ -809,7 +806,7 @@ done %else %define _name ffmpeg Name: ffmpeg-7-mini -Version: 7.0 +Version: 7.0.2 Release: 0 Summary: Set of libraries for working with various multimedia formats License: GPL-3.0-or-later @@ -825,9 +822,6 @@ Patch4: ffmpeg-4.2-dlopen-fdk_aac.patch Patch5: work-around-abi-break.patch Patch10: ffmpeg-chromium.patch Patch91: ffmpeg-dlopen-openh264.patch -Patch92: ffmpeg-7-CVE-2024-32228.patch -Patch93: ffmpeg-7-CVE-2024-32230.patch -Patch94: ffmpeg-7-CVE-2024-32229.patch Patch95: ffmpeg-7-fix-crashes.patch BuildRequires: c_compiler Requires: this-is-only-for-build-envs