Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
尘离序散
obs-studio
提交
b8f91cc4
O
obs-studio
项目概览
尘离序散
/
obs-studio
与 Fork 源项目一致
从无法访问的项目Fork
通知
30
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
O
obs-studio
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
b8f91cc4
编写于
6月 22, 2020
作者:
D
derrod
浏览文件
操作
浏览文件
下载
电子邮件补丁
差异文件
rtmp-services: Remove Mixer servers and checks
上级
db37cc34
变更
3
隐藏空白更改
内联
并排
Showing
3 changed file
with
2 addition
and
178 deletion
+2
-178
plugins/rtmp-services/data/package.json
plugins/rtmp-services/data/package.json
+2
-2
plugins/rtmp-services/data/services.json
plugins/rtmp-services/data/services.json
+0
-172
plugins/rtmp-services/rtmp-common.c
plugins/rtmp-services/rtmp-common.c
+0
-4
未找到文件。
plugins/rtmp-services/data/package.json
浏览文件 @
b8f91cc4
{
"url"
:
"https://obsproject.com/obs2_update/rtmp-services"
,
"version"
:
14
3
,
"version"
:
14
4
,
"files"
:
[
{
"name"
:
"services.json"
,
"version"
:
14
3
"version"
:
14
4
}
]
}
plugins/rtmp-services/data/services.json
浏览文件 @
b8f91cc4
...
...
@@ -290,178 +290,6 @@
"max audio bitrate"
:
320
}
},
{
"name"
:
"Mixer.com - FTL"
,
"common"
:
true
,
"servers"
:
[
{
"name"
:
"US: Dallas, TX"
,
"url"
:
"ingest-dal.mixer.com"
},
{
"name"
:
"US: San Jose, CA"
,
"url"
:
"ingest-sjc.mixer.com"
},
{
"name"
:
"US: Seattle, WA"
,
"url"
:
"ingest-sea.mixer.com"
},
{
"name"
:
"US: Washington DC"
,
"url"
:
"ingest-wdc.mixer.com"
},
{
"name"
:
"Canada: Toronto"
,
"url"
:
"ingest-tor.mixer.com"
},
{
"name"
:
"EU: London"
,
"url"
:
"ingest-lon.mixer.com"
},
{
"name"
:
"EU: Amsterdam"
,
"url"
:
"ingest-ams.mixer.com"
},
{
"name"
:
"EU: Milan"
,
"url"
:
"ingest-mil.mixer.com"
},
{
"name"
:
"EU: Paris"
,
"url"
:
"ingest-par.mixer.com"
},
{
"name"
:
"EU: Frankfurt"
,
"url"
:
"ingest-fra.mixer.com"
},
{
"name"
:
"Brazil: Sao Paulo"
,
"url"
:
"ingest-sao.mixer.com"
},
{
"name"
:
"Australia: Melbourne"
,
"url"
:
"ingest-mel.mixer.com"
},
{
"name"
:
"Australia: Sydney"
,
"url"
:
"ingest-syd.mixer.com"
},
{
"name"
:
"Mexico: Mexico City"
,
"url"
:
"ingest-mex.mixer.com"
},
{
"name"
:
"Asia: Hong Kong"
,
"url"
:
"ingest-hkg.mixer.com"
},
{
"name"
:
"Asia: Tokyo"
,
"url"
:
"ingest-tok.mixer.com"
},
{
"name"
:
"South Korea: Seoul"
,
"url"
:
"ingest-seo.mixer.com"
},
{
"name"
:
"India: Chennai"
,
"url"
:
"ingest-che.mixer.com"
}
],
"recommended"
:
{
"keyint"
:
2
,
"output"
:
"ftl_output"
,
"max audio bitrate"
:
160
,
"max video bitrate"
:
10000
,
"profile"
:
"main"
,
"bframes"
:
0
,
"x264opts"
:
"scenecut=0"
}
},
{
"name"
:
"Mixer.com - RTMP"
,
"common"
:
true
,
"servers"
:
[
{
"name"
:
"US: Dallas, TX"
,
"url"
:
"rtmp://ingest-dal.mixer.com:1935/beam"
},
{
"name"
:
"US: San Jose, CA"
,
"url"
:
"rtmp://ingest-sjc.mixer.com:1935/beam"
},
{
"name"
:
"US: Seattle, WA"
,
"url"
:
"rtmp://ingest-sea.mixer.com:1935/beam"
},
{
"name"
:
"US: Washington DC"
,
"url"
:
"rtmp://ingest-wdc.mixer.com:1935/beam"
},
{
"name"
:
"Canada: Toronto"
,
"url"
:
"rtmp://ingest-tor.mixer.com:1935/beam"
},
{
"name"
:
"EU: London"
,
"url"
:
"rtmp://ingest-lon.mixer.com:1935/beam"
},
{
"name"
:
"EU: Amsterdam"
,
"url"
:
"rtmp://ingest-ams.mixer.com:1935/beam"
},
{
"name"
:
"EU: Milan"
,
"url"
:
"rtmp://ingest-mil.mixer.com:1935/beam"
},
{
"name"
:
"EU: Paris"
,
"url"
:
"rtmp://ingest-par.mixer.com:1935/beam"
},
{
"name"
:
"EU: Frankfurt"
,
"url"
:
"rtmp://ingest-fra.mixer.com:1935/beam"
},
{
"name"
:
"Brazil: Sao Paulo"
,
"url"
:
"rtmp://ingest-sao.mixer.com:1935/beam"
},
{
"name"
:
"Australia: Melbourne"
,
"url"
:
"rtmp://ingest-mel.mixer.com:1935/beam"
},
{
"name"
:
"Australia: Sydney"
,
"url"
:
"rtmp://ingest-syd.mixer.com:1935/beam"
},
{
"name"
:
"Mexico: Mexico City"
,
"url"
:
"rtmp://ingest-mex.mixer.com:1935/beam"
},
{
"name"
:
"Asia: Hong Kong"
,
"url"
:
"rtmp://ingest-hkg.mixer.com:1935/beam"
},
{
"name"
:
"Asia: Tokyo"
,
"url"
:
"rtmp://ingest-tok.mixer.com:1935/beam"
},
{
"name"
:
"South Korea: Seoul"
,
"url"
:
"rtmp://ingest-seo.mixer.com:1935/beam"
},
{
"name"
:
"India: Chennai"
,
"url"
:
"rtmp://ingest-che.mixer.com:1935/beam"
}
],
"recommended"
:
{
"keyint"
:
2
,
"max audio bitrate"
:
160
,
"max video bitrate"
:
10000
,
"profile"
:
"main"
,
"x264opts"
:
"scenecut=0"
}
},
{
"name"
:
"Mobcrush"
,
"servers"
:
[
...
...
plugins/rtmp-services/rtmp-common.c
浏览文件 @
b8f91cc4
...
...
@@ -340,10 +340,6 @@ static void fill_servers(obs_property_t *servers_prop, json_t *service,
return
;
}
if
(
strcmp
(
name
,
"Mixer.com - FTL"
)
==
0
)
{
obs_property_list_add_string
(
servers_prop
,
obs_module_text
(
"Server.Auto"
),
"auto"
);
}
if
(
strcmp
(
name
,
"Twitch"
)
==
0
)
{
if
(
fill_twitch_servers
(
servers_prop
))
return
;
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录