From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 442F41382C5 for ; Tue, 30 Jun 2020 21:44:30 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 80F6CE08C8; Tue, 30 Jun 2020 21:44:29 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 6BFB2E08C8 for ; Tue, 30 Jun 2020 21:44:29 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6121F34F2CC for ; Tue, 30 Jun 2020 21:44:28 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9A1432C8 for ; Tue, 30 Jun 2020 21:44:24 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1593553442.62a081d800ec28836843c9a2db67ed80cbb52b12.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/mlt/, media-libs/mlt/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch media-libs/mlt/mlt-6.20.0-r2.ebuild X-VCS-Directories: media-libs/mlt/files/ media-libs/mlt/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 62a081d800ec28836843c9a2db67ed80cbb52b12 X-VCS-Branch: master Date: Tue, 30 Jun 2020 21:44:24 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5167971d-c553-48c1-961d-0b11a950b2c6 X-Archives-Hash: 05037e3398b11e7aa96bd9ade9afb63f commit: 62a081d800ec28836843c9a2db67ed80cbb52b12 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Jun 30 21:00:29 2020 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jun 30 21:44:02 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=62a081d8 media-libs/mlt: fix crash with filters not supporting preview scale Upstream commit dc585bfa5765db418923e7b4802c03bc57733111 Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner gentoo.org> ...-6.20.0-crash-w-unsupported-preview-scale.patch | 48 ++++++++++++++++++++++ media-libs/mlt/mlt-6.20.0-r2.ebuild | 1 + 2 files changed, 49 insertions(+) diff --git a/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch b/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch new file mode 100644 index 00000000000..25057b3c1ae --- /dev/null +++ b/media-libs/mlt/files/mlt-6.20.0-crash-w-unsupported-preview-scale.patch @@ -0,0 +1,48 @@ +From dc585bfa5765db418923e7b4802c03bc57733111 Mon Sep 17 00:00:00 2001 +From: Dan Dennedy +Date: Mon, 2 Mar 2020 14:02:26 -0800 +Subject: [PATCH] fix crash with filters not supporting preview scale + +--- + src/modules/frei0r/transition_frei0r.c | 18 +++++++++++++++++- + 1 file changed, 17 insertions(+), 1 deletion(-) + +diff --git a/src/modules/frei0r/transition_frei0r.c b/src/modules/frei0r/transition_frei0r.c +index b69011719..f11266b75 100644 +--- a/src/modules/frei0r/transition_frei0r.c ++++ b/src/modules/frei0r/transition_frei0r.c +@@ -1,7 +1,7 @@ + /* + * transition_frei0r.c -- frei0r transition + * Copyright (c) 2008 Marco Gittler +- * Copyright (C) 2009-2019 Meltytech, LLC ++ * Copyright (C) 2009-2020 Meltytech, LLC + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public +@@ -67,9 +67,25 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f + } + else + { ++ mlt_image_format b_format = *format; ++ int b_width = *width; ++ int b_height = *height; ++ + error = mlt_frame_get_image( a_frame, &images[0], format, width, height, 0 ); + if ( error ) return error; + ++ if (*width != b_width || *height != b_height) { ++ if (invert) { ++ *image = images[0]; ++ } else { ++ *image = images[1]; ++ *format = b_format; ++ *width = b_width; ++ *height = b_height; ++ } ++ return error; ++ } ++ + mlt_position position = mlt_transition_get_position( transition, a_frame ); + mlt_profile profile = mlt_service_profile( MLT_TRANSITION_SERVICE( transition ) ); + double time = (double) position / mlt_profile_fps( profile ); diff --git a/media-libs/mlt/mlt-6.20.0-r2.ebuild b/media-libs/mlt/mlt-6.20.0-r2.ebuild index 4f93b42419b..d261114c200 100644 --- a/media-libs/mlt/mlt-6.20.0-r2.ebuild +++ b/media-libs/mlt/mlt-6.20.0-r2.ebuild @@ -88,6 +88,7 @@ PATCHES=( "${FILESDIR}"/${P}-no-gtk2.patch "${FILESDIR}"/${P}-opencv4.patch "${FILESDIR}"/${P}-nullpointer-crash.patch + "${FILESDIR}"/${P}-crash-w-unsupported-preview-scale.patch ) pkg_setup() {