summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorDaniel Bermond2018-10-17 18:27:16 +0000
committerDaniel Bermond2018-10-17 18:27:16 +0000
commit2da79b7e7abbdc07fe768fa9f188c0f6bcf037ba (patch)
tree50960a3e1b744fde9ad8977645b830dc94292284 /PKGBUILD
parentaac1f8110827d7fade003b413e2e48d9b37a0055 (diff)
downloadaur-2da79b7e7abbdc07fe768fa9f188c0f6bcf037ba.tar.gz
Update conflicts
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 7a4bae26286a..1a454edbe289 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,7 +1,7 @@
# Maintainer: Daniel Bermond < gmail-com: danielbermond >
pkgname=ffmpeg-full-git
-pkgver=4.1.r92189.g41ed2c3849
+pkgver=4.1.r92192.g57f312a34d
pkgrel=1
pkgdesc='Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version)'
arch=('i686' 'x86_64')
@@ -44,7 +44,7 @@ makedepends_x86_64=(
provides=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git' 'libavutil.so' 'libavcodec.so'
'libavformat.so' 'libavdevice.so' 'libavfilter.so' 'libavresample.so'
'libswscale.so' 'libswresample.so' 'libpostproc.so')
-conflicts=('ffmpeg' 'ffmpeg-full' 'ffmpeg-git')
+conflicts=('ffmpeg')
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git'
'LICENSE')
sha256sums=('SKIP'