[gentoo-commits] repo/gentoo:master commit in: media-video/ffmpeg/files/, media-video/ffmpeg/

[Alexis Ballier]

commit:     2dacc4667f7237c6ab6da9039b125af8bc5fc441
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Wed Jul 18 18:01:17 2018 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jul 19 11:08:48 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2dacc466

media-video/ffmpeg: bump to 3.4.4

Package-Manager: Portage-2.3.43, Repoman-2.3.10

 media-video/ffmpeg/Manifest                        |  2 +-
 ...{ffmpeg-3.4.3-r1.ebuild => ffmpeg-3.4.4.ebuild} |  1 -
 media-video/ffmpeg/files/imgc.patch                | 29 ----------------------
 3 files changed, 1 insertion(+), 31 deletions(-)

diff --git a/media-video/ffmpeg/Manifest b/media-video/ffmpeg/Manifest
index c2e98a37877..7473ea549db 100644
--- a/media-video/ffmpeg/Manifest
+++ b/media-video/ffmpeg/Manifest
@@ -2,5 +2,5 @@ DIST ffmpeg-3.2.6.tar.bz2 9623111 BLAKE2B 
76ed10d969ec5e85c0ad23fee1118ccfd66689
 DIST ffmpeg-3.2.7.tar.bz2 9622391 BLAKE2B 
7d6f094ca0bd5e2cab02e051acc8e554873bca2d165fc9326de0b12e145ec939567aed95c01589c47291970a89fb3462c75d32db1c4c2c8cf6d4a14956cd8a79
 SHA512 
a5b6df77d2d4ede0cc2f398b763d7405f43f43e37c11a596ec1a2a8921714875fd8fa9ffbcff84355854780872ab7313c859a4a19bf419298b4d3bc797ad8ac4
 DIST ffmpeg-3.3.4.tar.bz2 9944256 BLAKE2B 
72d42a16396882b30641fb057bb597f8e98ecfa482a087ece48189acba8a80a72e931e70ad961db8c01c93a556f619ebdecb39bae9d4559cc504d0f7eabf15a7
 SHA512 
d2257a71f9ae7856390b807d70bf643d4360fe4f2ad7c76af3ac5332cda353a1a543cdcdea0c510dbb6141f7a3a36ffbf26ae87b0ffc9ce4b3b7641814a40e3a
 DIST ffmpeg-3.3.6.tar.bz2 9943322 BLAKE2B 
2526fdf9580045131426e554a9bf44fdc6567c12213ea4d5b78aa27f14513f14e07f38b8380183686fa1a62440fe4108eaecddca96f4dec3c74c410b1f90ee03
 SHA512 
1305760fa981bcb43c8fcb5dd1bf7dd8d3f405a124975f062062b741d49e12386e4d3eec3de6a032fc93cd7f6086d939275a669a9997ffa400f70c20f7eb3d23
-DIST ffmpeg-3.4.3.tar.bz2 10183483 BLAKE2B 
144811663ab32db05577e262e2fcf9087528544b2f27fb6c551317d4916d399ee2d6e70f6f5ce6351ba78f6f51609b2455eef6170b3e339699c9f2486a459194
 SHA512 
924838d334d905de23c950634ad905bc55ae4435e135afdea93639a598ad522c020165f4528c66560448c136c28770c3fd3311328c2307bb232bc1d0914af964
+DIST ffmpeg-3.4.4.tar.bz2 10181822 BLAKE2B 
1b15d389576cbbe6d375e8934aac20a1d7ee5854c711aa90cc831201e5b1f42ed8b2c2b277ddde33060cda8fcd605dc6f3fa5e95ab8dff9125515de2d5bf8579
 SHA512 
6803ede26d403dd38835491e0b66c23856d62312a32520ad98866ebd4468d1d50723060c45101481282285711790bcf810c5012bc067e54568fc1954d361e620
 DIST ffmpeg-4.0.2.tar.bz2 10424065 BLAKE2B 
0d3e072fa31bfae37722d8113f9c9cfd2071067b2a29ed5c7332ae49b388b91e8646b6bc8a816517bcebcdcc8d923d1e8b5a080dbdc63ea2a153aea8ecfb2af9
 SHA512 
92a3bedcd070df72b26dbe3ebf4a3faea0a02289fbefdb6a6c73d65801cf60a7e11cd832d29ab46b7749a1ffd0a31505cf75bb46bd01ea06423b454ca04e9b7b

diff --git a/media-video/ffmpeg/ffmpeg-3.4.3-r1.ebuild 
b/media-video/ffmpeg/ffmpeg-3.4.4.ebuild
similarity index 99%
rename from media-video/ffmpeg/ffmpeg-3.4.3-r1.ebuild
rename to media-video/ffmpeg/ffmpeg-3.4.4.ebuild
index cfc053565cd..aa8b226963b 100644
--- a/media-video/ffmpeg/ffmpeg-3.4.3-r1.ebuild
+++ b/media-video/ffmpeg/ffmpeg-3.4.4.ebuild
@@ -290,7 +290,6 @@ S=${WORKDIR}/${P/_/-}
 
 PATCHES=(
        "${FILESDIR}"/chromium.patch
-       "${FILESDIR}"/imgc.patch
 )
 
 MULTILIB_WRAPPED_HEADERS=(

diff --git a/media-video/ffmpeg/files/imgc.patch 
b/media-video/ffmpeg/files/imgc.patch
deleted file mode 100644
index 793299ad703..00000000000
--- a/media-video/ffmpeg/files/imgc.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-commit c1e172c2e14ef059dac632f7c67f081dfecd30dc
-Author: Simon Thelen <ffmpeg-...@c-14.de>
-Date:   Tue Apr 3 14:41:33 2018 +0200
-
-    avcodec/imgconvert: fix possible null pointer dereference
-    
-    regression since 354b26a3945eadd4ed8fcd801dfefad2566241de
-    
-    (cherry picked from commit 8c2c97403baf95d0facb53f03e468f023eb943e1)
-
-diff --git a/libavcodec/imgconvert.c b/libavcodec/imgconvert.c
-index 7b0005b308..1fd636c83d 100644
---- a/libavcodec/imgconvert.c
-+++ b/libavcodec/imgconvert.c
-@@ -72,11 +72,12 @@ enum AVPixelFormat avcodec_find_best_pix_fmt_of_list(const 
enum AVPixelFormat *p
-     int loss;
- 
-     for (i=0; pix_fmt_list[i] != AV_PIX_FMT_NONE; i++) {
--        loss = *loss_ptr;
-+        loss = loss_ptr ? *loss_ptr : 0;
-         best = avcodec_find_best_pix_fmt_of_2(best, pix_fmt_list[i], 
src_pix_fmt, has_alpha, &loss);
-     }
- 
--    *loss_ptr = loss;
-+    if (loss_ptr)
-+        *loss_ptr = loss;
-     return best;
- }
-