summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--multimedia/ffmpeg/README1
-rw-r--r--multimedia/ffmpeg/ffmpeg.SlackBuild8
2 files changed, 7 insertions, 2 deletions
diff --git a/multimedia/ffmpeg/README b/multimedia/ffmpeg/README
index ad58775fe8..521fa56ac6 100644
--- a/multimedia/ffmpeg/README
+++ b/multimedia/ffmpeg/README
@@ -8,6 +8,7 @@ ASS=yes|no (default: no), requires libass
BLURAY=yes|no (default: no), requires libbluray
CELT=yes|no (default: no), requires celt
DC1394=yes|no (default: no), requires libdc1394
+DECKLINK=yes|no (default: no), requires decklink-sdk
FAAC=yes|no (default: no), requires faac (creates non-redistributable binary)
FDK_AAC=yes|no (default: no), requires libfdk-aac (creates non-redistributable binary)
FLITE=yes|no (default: no), requires flite
diff --git a/multimedia/ffmpeg/ffmpeg.SlackBuild b/multimedia/ffmpeg/ffmpeg.SlackBuild
index 5953f4735c..feb7d2a770 100644
--- a/multimedia/ffmpeg/ffmpeg.SlackBuild
+++ b/multimedia/ffmpeg/ffmpeg.SlackBuild
@@ -108,13 +108,16 @@ opencore_amr="" ; [ "${OPENCORE:-no}" != "no" ] && \
opencore_amr="--enable-libopencore-amrnb --enable-libopencore-amrwb"
libfaac="" ; [ "${FAAC:-no}" != "no" ] && \
{ libfaac="--enable-libfaac" ; non_free="--enable-nonfree" ; }
-fdk="" ; [ "${FDK_AAC:-no}" != "no" ] && \
+fdk="" ; [ "${FDK_AAC:-no}" != "no" ] && \
{ fdk="--enable-libfdk-aac"; non_free="--enable-nonfree" ; }
-ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \
+ssl="" ; [ "${OPENSSL:-no}" != "no" ] && \
{ ssl="--enable-openssl" ; non_free="--enable-nonfree" ; }
openjpeg="" ; [ "${JP2:-no}" != "no" ] && \
{ openjpeg="--enable-libopenjpeg" ; \
SLKCFLAGS="$SLKCFLAGS -I/usr/include/openjpeg-1.5" ; }
+decklink="" ; [ "${DECKLINK:-no}" != "no" ] && \
+ { decklink="--enable-decklink" ; \
+ SLKCFLAGS="$SLKCFLAGS -I/usr/include/decklink" ; }
# zeromq support requires zeromq > 3.x
#libzmq="" ; [ "${ZMQ:-no}" != "no" ] && libzmq="--enable-libzmq"
@@ -197,6 +200,7 @@ CXXFLAGS="$SLKCFLAGS" \
$libx265 \
$libzvbi \
$libopencv \
+ $decklink \
$ssl
make