Commit 5f7411e1 authored by Bernd Kuhls's avatar Bernd Kuhls Committed by Thomas Petazzoni
Browse files

package/ffmpeg: Add support for GnuTLS 

Besides OpenSSL ffmpeg also supports GnuTLS.

If both GnuTLS and OpenSSL are enabled, the former takes precedence over
the latter:
http://git.videolan.org/?p=ffmpeg.git;a=blob;f=configure;h=7f9fed31a491ed0991aee2d354dba82e54e3291e;hb=refs/heads/release/2.8#l2719



Signed-off-by: default avatarBernd Kuhls <bernd.kuhls@t-online.de>
Reviewed-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent a2cc9655

package/ffmpeg/ffmpeg.mk

+6 −0
Original line number Diff line number Diff line
@@ -200,6 +200,11 @@ else 
FFMPEG_CONF_OPTS += --disable-libfdk-aac

endif



ifeq ($(BR2_PACKAGE_GNUTLS),y)

FFMPEG_CONF_OPTS += --enable-gnutls --disable-openssl

FFMPEG_DEPENDENCIES += gnutls

else

FFMPEG_CONF_OPTS += --disable-gnutls

ifeq ($(BR2_PACKAGE_OPENSSL),y)

# openssl isn't license compatible with GPL

ifeq ($(BR2_PACKAGE_FFMPEG_GPL)x$(BR2_PACKAGE_FFMPEG_NONFREE),yx)
@@ -211,6 +216,7 @@ endif 
else

FFMPEG_CONF_OPTS += --disable-openssl

endif

endif



ifeq ($(BR2_PACKAGE_LIBDCADEC),y)

FFMPEG_CONF_OPTS += --enable-libdcadec