diff options
author | Alexander Kanavin <alex.kanavin@gmail.com> | 2019-02-19 18:47:11 +0100 |
---|---|---|
committer | Richard Purdie <richard.purdie@linuxfoundation.org> | 2019-02-20 11:30:26 +0000 |
commit | 6fa26f6992e1d5758fda46e1efedabc681222367 (patch) | |
tree | d7aa57804fed63951815a9bfd1eb6f94dfa25633 /meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch | |
parent | 73ebdcaedde460108f98971f037e50e9b15c9f0c (diff) | |
download | openembedded-core-contrib-6fa26f6992e1d5758fda46e1efedabc681222367.tar.gz |
ffmpeg: update to 4.1.1
Drop backported patches.
Signed-off-by: Alexander Kanavin <alex.kanavin@gmail.com>
Signed-off-by: Richard Purdie <richard.purdie@linuxfoundation.org>
Diffstat (limited to 'meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch')
-rw-r--r-- | meta/recipes-multimedia/ffmpeg/ffmpeg/CVE-2018-15822.patch | 37 |
1 files changed, 0 insertions, 37 deletions
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 <michael@niedermayer.cc> -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# <HCHEN017@e.ntu.edu.sg> -Signed-off-by: Michael Niedermayer <michael@niedermayer.cc> -Signed-off-by: Mingli Yu <Mingli.Yu@windriver.com> ---- - 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 - |