Accepting request 655451 from multimedia:libs

OBS-URL: https://build.opensuse.org/request/show/655451
OBS-URL: https://build.opensuse.org/package/show/openSUSE:Factory/ffmpeg-4?expand=0&rev=6
This commit is contained in:
Dominique Leuenberger 2018-12-11 14:41:40 +00:00 committed by Git OBS Bridge
commit a7e1480f0a
3 changed files with 14 additions and 7 deletions

View File

@ -14,6 +14,7 @@ flac # libFLAC
gif # libpng
gsm # libgsm
huffyuv # trivial+zlib
ilbc # ilbc
libaom # libaom
libaom_av1 # libaom
libcelt # celt, opus

View File

@ -1,3 +1,10 @@
-------------------------------------------------------------------
Wed Dec 5 18:07:58 UTC 2018 - Stefan Brüns <stefan.bruens@rwth-aachen.de>
- Enable encoding/decoding with nvcodec, the required headers are already
in TW (permissively licensed). The required NVidia libraries are dlopen'ed.
- Enable ILBC decoder, ilbc is free and already packaged standalone.
-------------------------------------------------------------------
Tue Nov 06 01:39:11 UTC 2018 - sean@suspend.net

View File

@ -38,15 +38,15 @@
%{preamble_string} ffmpeg-private-devel %{comparator} %{conflicts_version} \
%{nil}
# nvidia adds library present only after leap15
# nvcodec headers only present after leap15
%bcond_with nvcodec
%if 0%{?BUILD_ORIG}
%bcond_without nvidia
%if 0%{?suse_version} > 1500
%bcond_without nvcodec
%endif
%if 0%{?BUILD_ORIG}
%bcond_without cuda_sdk
%else
%bcond_with nvidia
%bcond_with cuda_sdk
%endif
%bcond_with fdk_aac
%bcond_with librtmp
@ -581,9 +581,8 @@ CFLAGS="%optflags" \
--enable-avresample \
--enable-gnutls \
--enable-ladspa \
%if ! %{with nvidia}
--disable-cuda \
--disable-cuvid \
%if ! %{with cuda_sdk}
--disable-cuda-sdk \
%endif
%if %{with libaom}
--enable-libaom \