diff options
| author | Daniel Bermond | 2017-07-09 14:48:42 -0300 |
|---|---|---|
| committer | Daniel Bermond | 2017-07-09 14:48:42 -0300 |
| commit | 96154e108a52e348d231d98ae8cfe5ac2107a75e (patch) | |
| tree | c432b08009b215be84d41a1ee7a71c08b2af733c | |
| parent | 576275f73fd4a9a3f2dd645bf158c3e77b823f11 (diff) | |
| download | aur-96154e108a52e348d231d98ae8cfe5ac2107a75e.tar.gz | |
conflicts: fixed a missing space
| -rw-r--r-- | .SRCINFO | 7 | ||||
| -rw-r--r-- | PKGBUILD | 4 |
2 files changed, 6 insertions, 5 deletions
@@ -1,9 +1,9 @@ # Generated by mksrcinfo v8 -# Sun Jul 9 16:41:15 UTC 2017 +# Sun Jul 9 17:47:53 UTC 2017 pkgbase = ffmpeg-git pkgdesc = Complete solution to record, convert and stream audio and video (git version) pkgver = 3.4.r86744.gfe9242204d - pkgrel = 1 + pkgrel = 2 url = http://www.ffmpeg.org/ arch = i686 arch = x86_64 @@ -71,7 +71,8 @@ pkgbase = ffmpeg-git conflicts = ffmpeg-nvenc conflicts = ffmpeg-qsv-git conflicts = ffmpeg-full - conflicts = ffmpeg-full-gitffmpeg-full-nvenc + conflicts = ffmpeg-full-git + conflicts = ffmpeg-full-nvenc conflicts = ffmpeg-semifull-git source = ffmpeg-git::git://source.ffmpeg.org/ffmpeg.git sha256sums = SKIP @@ -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') |