diff options
author | Daniel Bermond | 2018-10-17 18:27:16 +0000 |
---|---|---|
committer | Daniel Bermond | 2018-10-17 18:27:16 +0000 |
commit | 2da79b7e7abbdc07fe768fa9f188c0f6bcf037ba (patch) | |
tree | 50960a3e1b744fde9ad8977645b830dc94292284 /.SRCINFO | |
parent | aac1f8110827d7fade003b413e2e48d9b37a0055 (diff) | |
download | aur-2da79b7e7abbdc07fe768fa9f188c0f6bcf037ba.tar.gz |
Update conflicts
Diffstat (limited to '.SRCINFO')
-rw-r--r-- | .SRCINFO | 4 |
1 files changed, 1 insertions, 3 deletions
@@ -1,6 +1,6 @@ pkgbase = ffmpeg-full-git pkgdesc = Complete solution to record, convert and stream audio and video (all possible features including nvenc, qsv and libfdk-aac; git version) - pkgver = 4.1.r92189.g41ed2c3849 + pkgver = 4.1.r92192.g57f312a34d pkgrel = 1 url = http://www.ffmpeg.org/ arch = i686 @@ -115,8 +115,6 @@ pkgbase = ffmpeg-full-git provides = libswresample.so provides = libpostproc.so conflicts = ffmpeg - conflicts = ffmpeg-full - conflicts = ffmpeg-git source = ffmpeg-full-git::git://source.ffmpeg.org/ffmpeg.git source = LICENSE sha256sums = SKIP |