jengelh/ffmpeg-4
SHA256
1
0
Fork 2
forked from pool/ffmpeg-4
Code Pull Requests 1 Activity

synchronize changelog with patch list after recent user submission

Browse Source 
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=32
This commit is contained in:
Jan Engelhardt 2018-11-07 12:29:42 +00:00 committed by Git OBS Bridge
parent d2e0febbbd
commit 80f63e5f1f
3 changed files with 1 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ffmpeg-4.changes
View File

@ -28,7 +28,7 @@ Tue Nov 06 01:39:11 UTC 2018 - sean@suspend.net
* Decoding S12M timecode in H264 * Decoding S12M timecode in H264
* For complete changelog, see https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1 * For complete changelog, see https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1
- Remove 0001-avcodec-libaom-fix-setting-amount-of-threads.patch - 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) - Remove cve-2017-17555.diff (fixed upstream)
------------------------------------------------------------------- -------------------------------------------------------------------

1
ffmpeg-4.spec
View File

@ -117,7 +117,6 @@ Patch1: ffmpeg-libcdio_cdda-pkgconfig.patch
Patch2: ffmpeg-arm6l.diff Patch2: ffmpeg-arm6l.diff
Patch3: ffmpeg-new-coder-errors.diff Patch3: ffmpeg-new-coder-errors.diff
Patch4: ffmpeg-codec-choice.diff Patch4: ffmpeg-codec-choice.diff
Patch5: cve-2017-17555.diff
BuildRequires: ladspa-devel BuildRequires: ladspa-devel
BuildRequires: libgsm-devel BuildRequires: libgsm-devel
BuildRequires: libmp3lame-devel BuildRequires: libmp3lame-devel

33
ffmpeg-CVE-2018-13305.patch
View File

@ -1,33 +0,0 @@
From d08d4a8c7387e758d439b0592782e4cfa2b4d6a4 Mon Sep 17 00:00:00 2001
From: Michael Niedermayer <michael@niedermayer.cc>
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 <jerome.borsboom@carpalis.nl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
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; \