summarylogtreecommitdiffstats
path: root/.SRCINFO
diff options
context:
space:
mode:
Diffstat (limited to '.SRCINFO')
-rw-r--r--.SRCINFO7
1 files changed, 4 insertions, 3 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 0a8e43cf9d61..93db0fdb565c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -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