reincluded obs-ffmpeg.c in patch

3 files changed, 43 insertions, 4 deletions

diff --git a/.SRCINFO b/.SRCINFO
index b3e63d07fc16..342981ac2068 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = obs-hevc-vaapi-git
 	pkgdesc = Free and open source software for video recording and live streaming. With VAAPI HEVC support.
 	pkgver = 27.1.3.r4.g9d6ecc8be
-	pkgrel = 1
+	pkgrel = 2
 	url = https://github.com/obsproject/obs-studio
 	arch = i686
 	arch = x86_64
@@ -43,7 +43,7 @@ pkgbase = obs-hevc-vaapi-git
 	sha256sums = SKIP
 	sha256sums = SKIP
 	sha256sums = SKIP
-	sha256sums = 02f9ee1c262ce25fc46819d3e85d0c2dab91a3ffcf537165f710f4f05c851558
+	sha256sums = dfb73c250f4e1f0fda2d2c8b8416f649639ff0730e444a68f30c7761d256d066
 	sha256sums = bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd
 
 pkgname = obs-hevc-vaapi-git
diff --git a/PKGBUILD b/PKGBUILD
index 1b9a10cad459..1264367ce328 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgname=obs-hevc-vaapi-git
 pkgver=27.1.3.r4.g9d6ecc8be
-pkgrel=1
+pkgrel=2
 pkgdesc="Free and open source software for video recording and live streaming. With VAAPI HEVC support."
 arch=(i686 x86_64)
 url="https://github.com/obsproject/obs-studio"
@@ -27,7 +27,7 @@ source=("$pkgname::git+https://github.com/obsproject/obs-studio.git#branch=maste
         "hevc-vaapi.diff"
         "fix_python_binary_loading.patch")
 sha256sums=("SKIP" "SKIP" "SKIP" "SKIP"
-            "02f9ee1c262ce25fc46819d3e85d0c2dab91a3ffcf537165f710f4f05c851558"
+            "dfb73c250f4e1f0fda2d2c8b8416f649639ff0730e444a68f30c7761d256d066"
             "bdfbd062f080bc925588aec1989bb1df34bf779cc2fc08ac27236679cf612abd")
 
 pkgver() {
diff --git a/hevc-vaapi.diff b/hevc-vaapi.diff
index bcb9b23d8e6c..7b8a8a3bcba4 100644
--- a/hevc-vaapi.diff
+++ b/hevc-vaapi.diff
@@ -263,3 +263,42 @@ index 445c5a792..a7a96d819 100644
  };
  
  #endif
+diff --git a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/obs-ffmpeg.c
+index b7a17095d..9d8397e68 100644
+--- a/plugins/obs-ffmpeg/obs-ffmpeg.c
++++ b/plugins/obs-ffmpeg/obs-ffmpeg.c
+@@ -35,6 +35,7 @@ extern struct obs_encoder_info nvenc_encoder_info;
+ 
+ #ifdef LIBAVUTIL_VAAPI_AVAILABLE
+ extern struct obs_encoder_info vaapi_encoder_info;
++extern struct obs_encoder_info vaapi_hevc_encoder_info;
+ #endif
+ 
+ #ifndef __APPLE__
+@@ -210,9 +211,9 @@ finish:
+ #endif
+ 
+ #ifdef LIBAVUTIL_VAAPI_AVAILABLE
+-static bool vaapi_supported(void)
++static bool vaapi_supported(const char *codec_name)
+ {
+-	AVCodec *vaenc = avcodec_find_encoder_by_name("h264_vaapi");
++	AVCodec *vaenc = avcodec_find_encoder_by_name(codec_name);
+ 	return !!vaenc;
+ }
+ #endif
+@@ -253,10 +254,14 @@ bool obs_module_load(void)
+ 		obs_register_encoder(&nvenc_encoder_info);
+ 	}
+ #if !defined(_WIN32) && defined(LIBAVUTIL_VAAPI_AVAILABLE)
+-	if (vaapi_supported()) {
++	if (vaapi_supported("h264_vaapi")) {
+ 		blog(LOG_INFO, "FFMPEG VAAPI supported");
+ 		obs_register_encoder(&vaapi_encoder_info);
+ 	}
++	if (vaapi_supported("hevc_vaapi")) {
++		blog(LOG_INFO, "FFMPEG HEVC VAAPI supported");
++		obs_register_encoder(&vaapi_hevc_encoder_info);
++	}
+ #endif
+ #endif
\ No newline at end of file