Accepting request 655380 from home:StefanBruens:branches:multimedia:libs

- 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.

OBS-URL: https://build.opensuse.org/request/show/655380
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/ffmpeg-4?expand=0&rev=35

enable_decoders

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

ffmpeg-4.changes

@@ -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
 

ffmpeg-4.spec

@@ -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}
+%if ! %{with cuda_sdk}
-	--disable-cuda \
+	--disable-cuda-sdk \
-	--disable-cuvid \
 %endif
 %if %{with libaom}
 	--enable-libaom \