From 6fa26f6992e1d5758fda46e1efedabc681222367 Mon Sep 17 00:00:00 2001 From: Alexander Kanavin Date: Tue, 19 Feb 2019 18:47:11 +0100 Subject: ffmpeg: update to 4.1.1 Drop backported patches. Signed-off-by: Alexander Kanavin Signed-off-by: Richard Purdie --- ...stprocess_template-remove-FF_REG_sp-from-.patch | 31 ------------------ .../ffmpeg/ffmpeg/CVE-2018-15822.patch | 37 ---------------------- 2 files changed, 68 deletions(-) delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch delete mode 100644 meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg') diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch deleted file mode 100644 index 83fb4b81af..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/0001-postproc-postprocess_template-remove-FF_REG_sp-from-.patch +++ /dev/null @@ -1,31 +0,0 @@ -From c1cbeb87db4bfc6e281e4254a6c7fdd3854fc9b9 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer -Date: Thu, 20 Dec 2018 22:40:06 +0100 -Subject: [PATCH] postproc/postprocess_template: remove FF_REG_sp from clobber - list - -Future gcc may no longer support this - -Upstream-Status: Backport [https://git.ffmpeg.org/gitweb/ffmpeg.git/commit/c1cbeb87db4bfc6e281e4254a6c7fdd3854fc9b9] -Tested-by: James Almer -Signed-off-by: Michael Niedermayer ---- - libpostproc/postprocess_template.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/libpostproc/postprocess_template.c b/libpostproc/postprocess_template.c -index 485eb5cfc0..b0adfd168c 100644 ---- a/libpostproc/postprocess_template.c -+++ b/libpostproc/postprocess_template.c -@@ -1317,7 +1317,7 @@ DERING_CORE((%0, %1, 8) ,(%%FF_REGd, %1, 4),%%mm2,%%mm4,%%mm0,%%mm3,%%mm5, - "1: \n\t" - : : "r" (src), "r" ((x86_reg)stride), "m" (c->pQPb), "m"(c->pQPb2), "q"(tmp) - NAMED_CONSTRAINTS_ADD(deringThreshold,b00,b02,b08) -- : "%"FF_REG_a, "%"FF_REG_d, "%"FF_REG_sp -+ : "%"FF_REG_a, "%"FF_REG_d - ); - #else // HAVE_7REGS && (TEMPLATE_PP_MMXEXT || TEMPLATE_PP_3DNOW) - int y; --- -2.20.1 - diff --git a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch b/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch deleted file mode 100644 index 7d5868a72a..0000000000 --- a/meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch +++ /dev/null @@ -1,37 +0,0 @@ -From 6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10 Mon Sep 17 00:00:00 2001 -From: Michael Niedermayer -Date: Sat, 28 Jul 2018 15:03:50 +0200 -Subject: [PATCH] avformat/flvenc: Check audio packet size - -Fixes: Assertion failure -Fixes: assert_flvenc.c:941_1.swf - -Upstream-Status: Backport [https://github.com/FFmpeg/FFmpeg/commit/6b67d7f05918f7a1ee8fc6ff21355d7e8736aa10] -CVE: CVE-2018-15822 - -Found-by: #CHEN HONGXU# -Signed-off-by: Michael Niedermayer -Signed-off-by: Mingli Yu ---- - libavformat/flvenc.c | 5 +++++ - 1 file changed, 5 insertions(+) - -diff --git a/libavformat/flvenc.c b/libavformat/flvenc.c -index 1c552a3e6b..e4863f1fc7 100644 ---- a/libavformat/flvenc.c -+++ b/libavformat/flvenc.c -@@ -883,6 +883,11 @@ static int flv_write_packet(AVFormatContext *s, AVPacket *pkt) - int flags = -1, flags_size, ret; - int64_t cur_offset = avio_tell(pb); - -+ if (par->codec_type == AVMEDIA_TYPE_AUDIO && !pkt->size) { -+ av_log(s, AV_LOG_WARNING, "Empty audio Packet\n"); -+ return AVERROR(EINVAL); -+ } -+ - if (par->codec_id == AV_CODEC_ID_VP6F || par->codec_id == AV_CODEC_ID_VP6A || - par->codec_id == AV_CODEC_ID_VP6 || par->codec_id == AV_CODEC_ID_AAC) - flags_size = 2; --- -2.17.1 - -- cgit 1.2.3-korg