From 01b1acf27cc0d86ce1e1bdda9be02cdf35f11091 Mon Sep 17 00:00:00 2001 From: Leigh Scott Date: Sat, 10 Oct 2020 17:18:50 +0100 Subject: [PATCH] Revert last commit --- ffmpeg.spec | 6 ++++-- vp9_vdpau.patch | 37 ------------------------------------- 2 files changed, 4 insertions(+), 39 deletions(-) delete mode 100644 vp9_vdpau.patch diff --git a/ffmpeg.spec b/ffmpeg.spec index e818923..0751495 100644 --- a/ffmpeg.spec +++ b/ffmpeg.spec @@ -102,7 +102,7 @@ ExclusiveArch: armv7hnl Summary: Digital VCR and streaming server Name: ffmpeg%{?flavor} Version: 4.3.1 -Release: 10%{?date}%{?date:git}%{?rel}%{?dist} +Release: 11%{?date}%{?date:git}%{?rel}%{?dist} License: %{ffmpeg_license} URL: http://ffmpeg.org/ %if 0%{?date} @@ -117,7 +117,6 @@ Patch2: libavfilter_glslang.cpp.patch # upstream asm commits Patch3: libavutil_x86_x86inc.asm.patch Patch4: tests_checkasm_vf_blend.c.patch -Patch5: vp9_vdpau.patch Requires: %{name}-libs%{?_isa} = %{version}-%{release} %{?_with_cuda:BuildRequires: cuda-minimal-build-%{_cuda_version_rpm} cuda-drivers-devel} %{?_with_libnpp:BuildRequires: pkgconfig(nppc-%{_cuda_version})} @@ -467,6 +466,9 @@ install -pm755 tools/qt-faststart %{buildroot}%{_bindir} %changelog +* Sat Oct 10 2020 Leigh Scott - 4.3.1-11 +- Revert last commit + * Sat Oct 10 2020 Leigh Scott - 4.3.1-10 - Add VP9 10/12 Bit support for VDPAU diff --git a/vp9_vdpau.patch b/vp9_vdpau.patch deleted file mode 100644 index b9f5934..0000000 --- a/vp9_vdpau.patch +++ /dev/null @@ -1,37 +0,0 @@ -From ccca62ef991f0a47dfa30c3e822d91294b8afe4c Mon Sep 17 00:00:00 2001 -From: ManojGuptaBonda -Date: Thu, 8 Oct 2020 11:48:51 +0530 -Subject: [PATCH] VP9 Profile 2 VDPAU support - -Added VDPAU to list of supported formats for VP9 420 10 and 12 bit -formats. Add VP9 10/12 Bit support for VDPAU - -Signed-off-by: Philip Langdale ---- - libavcodec/vp9.c | 6 ++++++ - 3 files changed, 8 insertions(+), 1 deletion(-) - -diff --git a/libavcodec/vp9.c b/libavcodec/vp9.c -index fd0bab14a239..8b89fd68e246 100644 ---- a/libavcodec/vp9.c -+++ b/libavcodec/vp9.c -@@ -223,6 +223,9 @@ static int update_size(AVCodecContext *avctx, int w, int h) - #endif - #if CONFIG_VP9_VAAPI_HWACCEL - *fmtp++ = AV_PIX_FMT_VAAPI; -+#endif -+#if CONFIG_VP9_VDPAU_HWACCEL -+ *fmtp++ = AV_PIX_FMT_VDPAU; - #endif - break; - case AV_PIX_FMT_YUV420P12: -@@ -231,6 +234,9 @@ static int update_size(AVCodecContext *avctx, int w, int h) - #endif - #if CONFIG_VP9_VAAPI_HWACCEL - *fmtp++ = AV_PIX_FMT_VAAPI; -+#endif -+#if CONFIG_VP9_VDPAU_HWACCEL -+ *fmtp++ = AV_PIX_FMT_VDPAU; - #endif - break; - }