From 3b8abd2126b6908a675ecc7708d56a5592c886ea Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Thu, 12 Oct 2023 11:10:31 +0200
Subject: [PATCH] Sync ffmpeg-custom with regular ffmpeg

---
 ffmpeg/custom/PKGBUILD | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/ffmpeg/custom/PKGBUILD b/ffmpeg/custom/PKGBUILD
index dc659683..ff685050 100644
--- a/ffmpeg/custom/PKGBUILD
+++ b/ffmpeg/custom/PKGBUILD
@@ -10,7 +10,7 @@
 _name=ffmpeg
 pkgname=ffmpeg-custom
 pkgver=6.0
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc='Complete solution to record, convert and stream audio and video (with more features enabled than regular ffmpeg)'
 arch=('x86_64')
@@ -135,6 +135,9 @@ prepare() {
   # FS#77813: fix playing ogg files with mplayer
   git cherry-pick -n cbcc817353a019da4332ad43deb7bbc4e695d02a
   patch -Np1 -i ../add-av_stream_get_first_dts-for-chromium.patch # https://crbug.com/1251779
+  # use non-deprecated nvenc GUID for conftest
+  git cherry-pick -n 03823ac0c6a38bd6ba972539e3203a592579792f
+  git cherry-pick -n d2b46c1ef768bc31ba9180f6d469d5b8be677500
 }
 
 pkgver() {