summarylogtreecommitdiffstats
diff options
context:
space:
mode:
authorDenis2023-03-06 01:05:55 +0100
committerDenis2023-03-06 01:05:55 +0100
commit56e961286a21cdd6ef1620d987ba7c6883f305a6 (patch)
treea2f4b106c5908c730747f95ef8b5bf0d7b47acb4
parentef9843986a36953c8c50f8a99f3548a9da2540d9 (diff)
downloadaur-56e961286a21cdd6ef1620d987ba7c6883f305a6.tar.gz
updated conflicts
-rw-r--r--.SRCINFO2
1 files changed, 1 insertions, 1 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 53e3298206f1..f2a64cef4edc 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -140,7 +140,7 @@ pkgbase = ffmpeg-nonvidia
provides = libpostproc.so
provides = libswresample.so
provides = libswscale.so
- options = debug
+ conflicts = ffmpeg
source = git+https://git.ffmpeg.org/ffmpeg.git?signed#tag=3949db4d261748a9f34358a388ee255ad1a7f0c0
source = 010-ffmpeg-add-svt-hevc-geb24a06.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-HEVC/eb24a06ba4ee4948f219a3246b88439a8090bd37/ffmpeg_plugin/master-0001-lavc-svt_hevc-add-libsvt-hevc-encoder-wrapper.patch
source = 030-ffmpeg-add-svt-vp9-gaaa8140.patch::https://raw.githubusercontent.com/OpenVisualCloud/SVT-VP9/aaa8140c8cdf6c073eaa6aaa5d003d1535fd0059/ffmpeg_plugin/master-0001-Add-ability-for-ffmpeg-to-run-svt-vp9.patch