From c7395b05ece4b9e204aa90984c8e29bd3eb739d9 Mon Sep 17 00:00:00 2001 From: jp9000 Date: Thu, 18 May 2017 23:42:01 -0700 Subject: [PATCH] obs-ffmpeg: Disable media source HW accel. for now Due to a noticeable frequency of crashes inside of FFmpeg when using hardware encoding on mac, this feature is going to be disabled for now pending more investigation at a later time. --- plugins/obs-ffmpeg/obs-ffmpeg-source.c | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/plugins/obs-ffmpeg/obs-ffmpeg-source.c b/plugins/obs-ffmpeg/obs-ffmpeg-source.c index cf4b31a7c..f0d83b5f2 100644 --- a/plugins/obs-ffmpeg/obs-ffmpeg-source.c +++ b/plugins/obs-ffmpeg/obs-ffmpeg-source.c @@ -153,8 +153,10 @@ static obs_properties_t *ffmpeg_source_getproperties(void *data) obs_properties_add_text(props, "input_format", obs_module_text("InputFormat"), OBS_TEXT_DEFAULT); +#ifndef __APPLE__ obs_properties_add_bool(props, "hw_decode", obs_module_text("HardwareDecode")); +#endif obs_properties_add_bool(props, "clear_on_media_end", obs_module_text("ClearOnMediaEnd")); @@ -292,7 +294,9 @@ static void ffmpeg_source_update(void *data, obs_data_t *settings) s->input = input ? bstrdup(input) : NULL; s->input_format = input_format ? bstrdup(input_format) : NULL; +#ifndef __APPLE__ s->is_hw_decoding = obs_data_get_bool(settings, "hw_decode"); +#endif s->is_clear_on_media_end = obs_data_get_bool(settings, "clear_on_media_end"); s->restart_on_activate = obs_data_get_bool(settings,