summarylogtreecommitdiffstats
path: root/PKGBUILD
diff options
context:
space:
mode:
authorDaniel Bermond2017-07-09 14:48:42 -0300
committerDaniel Bermond2017-07-09 14:48:42 -0300
commit96154e108a52e348d231d98ae8cfe5ac2107a75e (patch)
treec432b08009b215be84d41a1ee7a71c08b2af733c /PKGBUILD
parent576275f73fd4a9a3f2dd645bf158c3e77b823f11 (diff)
downloadaur-96154e108a52e348d231d98ae8cfe5ac2107a75e.tar.gz
conflicts: fixed a missing space
Diffstat (limited to 'PKGBUILD')
-rw-r--r--PKGBUILD4
1 files changed, 2 insertions, 2 deletions
diff --git a/PKGBUILD b/PKGBUILD
index 02398bded7f5..8d659e8f6136 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
pkgname=ffmpeg-git
pkgver=3.4.r86744.gfe9242204d
-pkgrel=1
+pkgrel=2
pkgdesc='Complete solution to record, convert and stream audio and video (git version)'
arch=('i686' 'x86_64')
url='http://www.ffmpeg.org/'
@@ -24,7 +24,7 @@ provides=('ffmpeg' 'qt-faststart' 'libavcodec.so' 'libavdevice.so' 'libavfilter.
'libavformat.so' 'libavresample.so' 'libavutil.so' 'libpostproc.so'
'libswresample.so' 'libswscale.so')
conflicts=('ffmpeg' 'ffmpeg-decklink' 'ffmpeg-libfdk_aac' 'ffmpeg-nvenc'
- 'ffmpeg-qsv-git' 'ffmpeg-full' 'ffmpeg-full-git''ffmpeg-full-nvenc'
+ 'ffmpeg-qsv-git' 'ffmpeg-full' 'ffmpeg-full-git' 'ffmpeg-full-nvenc'
'ffmpeg-semifull-git')
source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
sha256sums=('SKIP')