diff --git a/0001-avformat-flvenc-Check-audio-packet-size.patch b/0001-avformat-flvenc-Check-audio-packet-size.patch deleted file mode 100644 index dd2dd2b..0000000 --- a/0001-avformat-flvenc-Check-audio-packet-size.patch +++ /dev/null @@ -1,33 +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 - -Found-by: #CHEN HONGXU# -Signed-off-by: Michael Niedermayer ---- - 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.18.0 - diff --git a/ffmpeg-4.0.2.tar.xz b/ffmpeg-4.0.2.tar.xz deleted file mode 100644 index 88a44a0..0000000 --- a/ffmpeg-4.0.2.tar.xz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:a95c0cc9eb990e94031d2183f2e6e444cc61c99f6f182d1575c433d62afb2f97 -size 8662984 diff --git a/ffmpeg-4.0.2.tar.xz.asc b/ffmpeg-4.0.2.tar.xz.asc deleted file mode 100644 index 021b87e..0000000 --- a/ffmpeg-4.0.2.tar.xz.asc +++ /dev/null @@ -1,11 +0,0 @@ ------BEGIN PGP SIGNATURE----- -Version: GnuPG v1 - -iQEcBAABAgAGBQJbT0bXAAoJELQyLwTWdljYa7EIAIkBwOpBdZNuVvD2aNH82zmP -1lnqsSFaO/OlQrs7M0cOGXgqmkIkVQZerWwO+VRct5oYut+MNCqVfT8L2pTNcHNW -6aE3Jtvw00zwklNKI9e4oktypvcbe8m40QgPvNPu8lxiGZvafvGy53ioVI2eANFj -PD2+BUGTRuotbm8skOpGTkU+RL74oPCdHEP9OcL3K4XnDFDMCXkjk34xCs4pnkV0 -2rVOque36M54DHQHa+qD1hxiqWiAyhEPnCklRwTRLLwPQuLiBDi/vExvDTsJHIuU -AfdSsykmJz3c6biKOKOP6GYW7UjfsiIOV+G+uuZGJ/eBw0zXc38l8Rc7C1Kwmj4= -=9xRf ------END PGP SIGNATURE----- diff --git a/ffmpeg-4.1.tar.xz b/ffmpeg-4.1.tar.xz new file mode 100644 index 0000000..584d6fb --- /dev/null +++ b/ffmpeg-4.1.tar.xz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:a38ec4d026efb58506a99ad5cd23d5a9793b4bf415f2c4c2e9c1bb444acd1994 +size 8890608 diff --git a/ffmpeg-4.1.tar.xz.asc b/ffmpeg-4.1.tar.xz.asc new file mode 100644 index 0000000..64b4870 --- /dev/null +++ b/ffmpeg-4.1.tar.xz.asc @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v1 + +iQEcBAABAgAGBQJb4NGUAAoJELQyLwTWdljYvM0IALBVSeOXmMzhNFDH8x0peai9 +IX6WaiOnVnKWmmguMl08h84+S9qAwm6ESBSF9Qaw+97/95d067BzisxmBlrMh2EX +/EkbdHjsWdAi0Dt5XXluIn0fDX271ad6dWeT5HZqXh/V9qvDFPegv8W/vFIhsOc6 +nZoFzkBZFD5Mwpj2jZMD13Dsmfg7hwNdw/YJd2WH8emBE8Izd90espTEv5IKS8qb +Zsk//H0psJfrDxBNZSSU3h2TvHccq5bqS3a3Kzw04aew0safp/aB87tUqxWoJ+PN +UbjWm1UxRrhhmqcEPT/3l8H68AiPn/ZN/2AUYYZXgdzorcoPBwWQIPaO7GtocxE= +=1RoC +-----END PGP SIGNATURE----- diff --git a/ffmpeg-4.changes b/ffmpeg-4.changes index 66d568b..6396fc7 100644 --- a/ffmpeg-4.changes +++ b/ffmpeg-4.changes @@ -1,3 +1,19 @@ +------------------------------------------------------------------- +Tue Nov 06 01:39:11 UTC 2018 - sean@suspend.net + +- Update ffmpeg to 4.1 + - Remove 0001-avcodec-libaom-fix-setting-amount-of-threads.patch (fixed upstream (bsc#776cdd1) + - Remove cve-2017-17555.diff (fixed upstream) + * For complete changelog, see https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.1 + +------------------------------------------------------------------- + +Sat Nov 03 14:48:35 UTC 2018 - sean@suspend.net + +- Remove 0001-avformat-fivenc-Check-audio-packet-size.patch (fixed upstream (bsc#8591d16) +- Update ffmpeg to 4.0.3 + * For complete changelog, see https://git.ffmpeg.org/gitweb/ffmpeg.git/shortlog/n4.0.3 + ------------------------------------------------------------------- Tue Oct 23 06:05:42 UTC 2018 - qzheng@suse.com diff --git a/ffmpeg-4.spec b/ffmpeg-4.spec index 786bb4e..4783a4c 100644 --- a/ffmpeg-4.spec +++ b/ffmpeg-4.spec @@ -98,7 +98,7 @@ %define _major_version 4 %define _major_expected 5 Name: ffmpeg-4 -Version: 4.0.2 +Version: 4.1 Release: 0 Summary: Library for working with various multimedia formats License: LGPL-2.1-or-later AND GPL-2.0-or-later @@ -118,9 +118,6 @@ Patch2: ffmpeg-arm6l.diff Patch3: ffmpeg-new-coder-errors.diff Patch4: ffmpeg-codec-choice.diff Patch5: cve-2017-17555.diff -Patch6: 0001-avformat-flvenc-Check-audio-packet-size.patch -Patch7: 0001-avcodec-libaom-fix-setting-amount-of-threads.patch -Patch8: ffmpeg-CVE-2018-13305.patch BuildRequires: ladspa-devel BuildRequires: libgsm-devel BuildRequires: libmp3lame-devel