Update conflicts

2 files changed, 3 insertions, 5 deletions

diff --git a/.SRCINFO b/.SRCINFO
index be28e7f13217..3a985d209a03 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = ffmpeg-qsv-git
 	pkgdesc = Complete solution to record, convert and stream audio and video (with Intel Quick Sync Video hardware acceleration, git version)
-	pkgver = 4.1.r92189.g41ed2c3849
+	pkgver = 4.1.r92192.g57f312a34d
 	pkgrel = 1
 	url = http://www.ffmpeg.org/
 	arch = x86_64
@@ -72,8 +72,6 @@ pkgbase = ffmpeg-qsv-git
 	provides = ffmpeg-qsv
 	provides = ffmpeg-git
 	conflicts = ffmpeg
-	conflicts = ffmpeg-qsv
-	conflicts = ffmpeg-git
 	source = ffmpeg-qsv-git::git://source.ffmpeg.org/ffmpeg.git
 	sha256sums = SKIP
 
diff --git a/PKGBUILD b/PKGBUILD
index 495df41ce864..d192e03c75ec 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: DrZaius <lou at fakeoutdoorsman.com>
 
 pkgname=ffmpeg-qsv-git
-pkgver=4.1.r92189.g41ed2c3849
+pkgver=4.1.r92192.g57f312a34d
 pkgrel=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with Intel Quick Sync Video hardware acceleration, git version)'
 arch=('x86_64')
@@ -29,7 +29,7 @@ optdepends=('ladspa: LADSPA filters')
 provides=('libavcodec.so' 'libavdevice.so' 'libavfilter.so' 'libavformat.so'
           'libavresample.so' 'libavutil.so' 'libpostproc.so' 'libswresample.so'
           'libswscale.so' 'ffmpeg' 'ffmpeg-qsv' 'ffmpeg-git')
-conflicts=('ffmpeg' 'ffmpeg-qsv' 'ffmpeg-git')
+conflicts=('ffmpeg')
 source=("$pkgname"::'git://source.ffmpeg.org/ffmpeg.git')
 sha256sums=('SKIP')