Revert last commit

el9
Leigh Scott 4 years ago
parent 24f22e79cd
commit 01b1acf27c

@ -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 <leigh123linux@gmail.com> - 4.3.1-11
- Revert last commit
* Sat Oct 10 2020 Leigh Scott <leigh123linux@gmail.com> - 4.3.1-10
- Add VP9 10/12 Bit support for VDPAU

@ -1,37 +0,0 @@
From ccca62ef991f0a47dfa30c3e822d91294b8afe4c Mon Sep 17 00:00:00 2001
From: ManojGuptaBonda <mbonda@nvidia.com>
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 <philipl@overt.org>
---
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;
}
Loading…
Cancel
Save