multimedia-packages/obs-studio
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix remove-ffmpeg-vaapi.patch #2

Browse Source
This commit is contained in:
Ward Nakchbandi 2023-03-04 21:11:50 +03:00
parent 67fc7cb6cc
commit 288821f82d
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
debian/patches/remove-ffmpeg-vaapi.patch vendored
View File

@ -17,18 +17,18 @@ diff '--color=auto' -ru a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/o
@@ -43,10 +43,6 @@ @@ -43,10 +43,6 @@
extern struct obs_encoder_info svt_av1_encoder_info; extern struct obs_encoder_info svt_av1_encoder_info;
extern struct obs_encoder_info aom_av1_encoder_info; extern struct obs_encoder_info aom_av1_encoder_info;
-#ifdef LIBAVUTIL_VAAPI_AVAILABLE -#ifdef LIBAVUTIL_VAAPI_AVAILABLE
-extern struct obs_encoder_info vaapi_encoder_info; -extern struct obs_encoder_info vaapi_encoder_info;
-#endif -#endif
- -
#ifndef __APPLE__ #ifndef __APPLE__
static const char *nvenc_check_name = "nvenc_check"; static const char *nvenc_check_name = "nvenc_check";
@@ -322,19 +318,6 @@ @@ -322,19 +318,6 @@
#endif #endif
-#ifdef LIBAVUTIL_VAAPI_AVAILABLE -#ifdef LIBAVUTIL_VAAPI_AVAILABLE
-static bool h264_vaapi_supported(void) -static bool h264_vaapi_supported(void)
-{ -{
@ -42,13 +42,13 @@ diff '--color=auto' -ru a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/o
- return vaapi_get_h264_default_device() != NULL; - return vaapi_get_h264_default_device() != NULL;
-} -}
-#endif -#endif
#ifdef _WIN32 #ifdef _WIN32
extern void jim_nvenc_load(bool h264, bool hevc, bool av1); extern void jim_nvenc_load(bool h264, bool hevc, bool av1);
@@ -412,20 +395,6 @@ @@ -412,20 +395,6 @@
amf_load(); amf_load();
#endif #endif
-#ifdef LIBAVUTIL_VAAPI_AVAILABLE -#ifdef LIBAVUTIL_VAAPI_AVAILABLE
- const char *libva_env = getenv("LIBVA_DRIVER_NAME"); - const char *libva_env = getenv("LIBVA_DRIVER_NAME");
- if (!!libva_env) - if (!!libva_env)
@ -64,6 +64,6 @@ diff '--color=auto' -ru a/plugins/obs-ffmpeg/obs-ffmpeg.c b/plugins/obs-ffmpeg/o
- } - }
-#endif -#endif
#endif #endif
#if ENABLE_FFMPEG_LOGGING #if ENABLE_FFMPEG_LOGGING
Only in a/plugins/obs-ffmpeg: obs-ffmpeg-vaapi.c Only in a/plugins/obs-ffmpeg: obs-ffmpeg-vaapi.c