浏览代码

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.
jp9000 8 年之前
父节点
当前提交
c7395b05ec
共有 1 个文件被更改,包括 4 次插入0 次删除
  1. 4 0
      plugins/obs-ffmpeg/obs-ffmpeg-source.c

+ 4 - 0
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,