From 80f63e5f1f4e24a2d1ebd5d3cfc2526e43006af1e0a78186d5eceea09433bc72 Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 7 Nov 2018 12:29:42 +0000 Subject: [PATCH] synchronize changelog with patch list after recent user submission OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=32 --- ffmpeg-4.changes | 2 +- ffmpeg-4.spec | 1 - ffmpeg-CVE-2018-13305.patch | 33 --------------------------------- 3 files changed, 1 insertion(+), 35 deletions(-) delete mode 100644 ffmpeg-CVE-2018-13305.patch diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 859d304..5ef79aa 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -28,7 +28,7 @@ Tue Nov 06 01:39:11 UTC 2018 - sean@suspend.net * Decoding S12M timecode in H264 * For complete changelog, see https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1 - Remove 0001-avcodec-libaom-fix-setting-amount-of-threads.patch - (fixed upstream (bsc#776cdd1) + (fixed upstream (bsc#776cdd1), remove ffmpeg-CVE-2018-13305.patch - Remove cve-2017-17555.diff (fixed upstream) ------------------------------------------------------------------- diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 4783a4c..d76c261 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -117,7 +117,6 @@ Patch1: ffmpeg-libcdio_cdda-pkgconfig.patch Patch2: ffmpeg-arm6l.diff Patch3: ffmpeg-new-coder-errors.diff Patch4: ffmpeg-codec-choice.diff -Patch5: cve-2017-17555.diff BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel diff --git a/ffmpeg-CVE-2018-13305.patch b/ffmpeg-CVE-2018-13305.patch deleted file mode 100644 index 5401ead..0000000 --- a/ffmpeg-CVE-2018-13305.patch +++ /dev/null @@ -1,33 +0,0 @@ -From d08d4a8c7387e758d439b0592782e4cfa2b4d6a4 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer -Date: Thu, 28 Jun 2018 23:46:32 +0200 -Subject: [PATCH] avcodec/vc1_block: Fix mqaunt check for negative values -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -Fixes: out of array access -Fixes: ffmpeg_bof_4.avi -Fixes: ffmpeg_bof_5.avi -Fixes: ffmpeg_bof_6.avi - -Found-by: Thuan Pham, Marcel Böhme, Andrew Santosa and Alexandru Razvan Caciulescu with AFLSmart -Reviewed-by: Jerome Borsboom -Signed-off-by: Michael Niedermayer ---- - libavcodec/vc1_block.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -Index: ffmpeg-4.0.2/libavcodec/vc1_block.c -=================================================================== ---- ffmpeg-4.0.2.orig/libavcodec/vc1_block.c -+++ ffmpeg-4.0.2/libavcodec/vc1_block.c -@@ -188,7 +188,7 @@ static void vc1_put_signed_blocks_clampe - mquant = v->altpq; \ - if ((edges&8) && s->mb_y == (s->mb_height - 1)) \ - mquant = v->altpq; \ -- if (!mquant || mquant > 31) { \ -+ if (!mquant || mquant > 31 || mquant < -31) { \ - av_log(v->s.avctx, AV_LOG_ERROR, \ - "Overriding invalid mquant %d\n", mquant); \ - mquant = 1; \