summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO4
-rwxr-xr-xPKGBUILD5
2 files changed, 6 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index d0a7dd5c9d07..775dbcc0c518 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
# Generated by mksrcinfo v8
-# Sun May 29 00:20:15 UTC 2016
+# Fri Jun 10 15:31:17 UTC 2016
pkgbase = ffmpeg-full-git
pkgdesc = Record, convert and stream audio and video (Git version with all possible libs)
- pkgver = N.80115.g1a82d2c
+ pkgver = N.80264.gd865e74
pkgrel = 1
url = http://www.ffmpeg.org/
arch = i686
diff --git a/PKGBUILD b/PKGBUILD
index d3350fcf908d..dfc72605dc30 100755
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -15,7 +15,7 @@
# intel-media-sdk (experimental Intel QSV support only for x86_64)
pkgname=ffmpeg-full-git
-pkgver=N.80115.g1a82d2c
+pkgver=N.80264.gd865e74
pkgrel=1
pkgdesc="Record, convert and stream audio and video (Git version with all possible libs)"
arch=('i686' 'x86_64')
@@ -74,12 +74,14 @@ build() {
_cuda="--enable-cuda"
_cudainc="-I/opt/cuda/include"
_cudalib="-L/opt/cuda/lib64"
+ _cuvid="--enable-cuvid"
_libnpp="--enable-libnpp"
_intelsdklib="-Wl,-rpath -Wl,/opt/intel/mediasdk/lib64"
else
_cuda=""
_cudainc=""
_cudalib=""
+ _cuvid=""
_libnpp=""
_intelsdklib=""
fi
@@ -104,6 +106,7 @@ build() {
--enable-avresample \
\
$_cuda \
+ $_cuvid \
--enable-libmfx \
--enable-nvenc \
--enable-omx \