SHA256
1
0
forked from jengelh/ffmpeg-5

- Unconditionalize ffnvcodec (like vmaf already is).

OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-5?expand=0&rev=5
This commit is contained in:
Jan Engelhardt 2022-01-30 20:29:12 +00:00 committed by Git OBS Bridge
parent d246a4091f
commit 6d2626ebd0
2 changed files with 1 additions and 7 deletions

View File

@ -3,6 +3,7 @@ Sun Jan 30 20:07:03 UTC 2022 - Jan Engelhardt <jengelh@inai.de>
- Enable building with glslang. (Should enable video blending - Enable building with glslang. (Should enable video blending
with GLSL.) with GLSL.)
- Unconditionalize ffnvcodec (like vmaf already is).
------------------------------------------------------------------- -------------------------------------------------------------------
Sun Jan 16 12:09:57 UTC 2022 - Callum Farmer <gmbr3@opensuse.org> Sun Jan 16 12:09:57 UTC 2022 - Callum Farmer <gmbr3@opensuse.org>

View File

@ -37,11 +37,6 @@
%preamble_string ffmpeg-private-devel %comparator %conflicts_version \ %preamble_string ffmpeg-private-devel %comparator %conflicts_version \
%nil %nil
# nvcodec headers only present after leap15
%bcond_with nvcodec
%if 0%{?suse_version} > 1500
%bcond_without nvcodec
%endif
%if 0%{?BUILD_ORIG} %if 0%{?BUILD_ORIG}
%bcond_with amrwb %bcond_with amrwb
%bcond_without cuda_sdk %bcond_without cuda_sdk
@ -234,9 +229,7 @@ BuildRequires: pkgconfig(fdk-aac)
%if %{with librtmp} %if %{with librtmp}
BuildRequires: pkgconfig(librtmp) BuildRequires: pkgconfig(librtmp)
%endif %endif
%if %{with nvcodec}
BuildRequires: pkgconfig(ffnvcodec) BuildRequires: pkgconfig(ffnvcodec)
%endif
%if %{with xvid} %if %{with xvid}
BuildRequires: libxvidcore-devel BuildRequires: libxvidcore-devel
%endif %endif