[avidemux] Resolve name clash between H264 and HEVC encoders (rfbz#5949)

commit 86541b71285b54c676fb30fe8ccc20597a44463c Author: Leigh Scott <leigh123linux(a)gmail.com&gt; Date: Wed Mar 10 07:31:01 2021 +0000 Resolve name clash between H264 and HEVC encoders (rfbz#5949) avidemux.spec | 6 +++++- fix_encoder_name.patch | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 1 deletion(-) --- diff --git a/avidemux.spec b/avidemux.spec index fc94dd2..7a780f5 100644 --- a/avidemux.spec +++ b/avidemux.spec @@ -10,7 +10,7 @@ Name: avidemux Version: 2.7.8 -Release: 2%{?dist} +Release: 3%{?dist} Summary: Graphical video editing and transcoding tool License: GPLv2+ @@ -18,6 +18,7 @@ URL: http://www.avidemux.org Source0: http://downloads.sourceforge.net/%{name}/%{name}_%{version}.tar.gz Patch0: https://github.com/mean00/avidemux2/commit/991bd96c4b729e62300caf87ff343b... +Patch1: https://github.com/mean00/avidemux2/commit/d7ecad79c55e6c21d6462bc69d2d04... # Don't try to build on arm, aarch64 or ppc ExclusiveArch: i686 x86_64 @@ -312,6 +313,9 @@ fi %changelog +* Wed Mar 10 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.7.8-3 +- Resolve name clash between H264 and HEVC encoders (rfbz#5949) + * Mon Mar 08 2021 Leigh Scott <leigh123linux(a)gmail.com&gt; - 2.7.8-2 - Ensure text margins in current time display are zero (rfbz#5948) diff --git a/fix_encoder_name.patch b/fix_encoder_name.patch new file mode 100644 index 0000000..10be20b --- /dev/null +++ b/fix_encoder_name.patch @@ -0,0 +1,32 @@ +From d7ecad79c55e6c21d6462bc69d2d0491efe3c184 Mon Sep 17 00:00:00 2001 +From: eumagga0x2a <eumagga0x2a(a)users.noreply.github.com&gt; +Date: Tue, 9 Mar 2021 21:55:47 +0100 +Subject: [PATCH] [ffNvEnc] Resolve name clash between H264 and HEVC encoders + created by 284b2afd7b5 + +--- + avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) + +diff --git a/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp b/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp +index 3c83bfbf3..d2a1b9c03 100644 +--- a/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp ++++ b/avidemux_plugins/ADM_videoEncoder/ffNvEnc/ffNvEncPlugin.cpp +@@ -79,7 +79,7 @@ extern "C" + + ADM_DECLARE_VIDEO_ENCODER_PREAMBLE(ADM_ffNvEncEncoder); + #ifdef H265_ENCODER +-ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEnc", ++ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEncHEVC", + "Nvidia HEVC", + "Nvidia hw encoder", + ffNvEncConfigure, // configuration +@@ -90,7 +90,7 @@ ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEnc", + nvEncProbe + ); + #else +-ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEnc", ++ADM_DECLARE_VIDEO_ENCODER_MAIN_EX("ffNvEncH264", + "Nvidia H264", + "Nvidia hw encoder", + ffNvEncConfigure, // configuration