New upstream version 24.0.5+dfsg1
This commit is contained in:
parent
52fa83f147
commit
4c2ea24267
61 changed files with 710 additions and 130 deletions
|
|
@ -5,6 +5,7 @@
|
|||
|
||||
#include "rtmp-format-ver.h"
|
||||
#include "twitch.h"
|
||||
#include "younow.h"
|
||||
|
||||
struct rtmp_common {
|
||||
char *service;
|
||||
|
|
@ -485,7 +486,9 @@ static void apply_video_encoder_settings(obs_data_t *settings,
|
|||
obs_data_set_string(settings, "rate_control", "CBR");
|
||||
|
||||
item = json_object_get(recommended, "profile");
|
||||
if (json_is_string(item)) {
|
||||
obs_data_item_t *enc_item = obs_data_item_byname(settings, "profile");
|
||||
if (json_is_string(item) &&
|
||||
obs_data_item_gettype(enc_item) == OBS_DATA_STRING) {
|
||||
const char *profile = json_string_value(item);
|
||||
obs_data_set_string(settings, "profile", profile);
|
||||
}
|
||||
|
|
@ -594,6 +597,12 @@ static const char *rtmp_common_url(void *data)
|
|||
}
|
||||
}
|
||||
|
||||
if (service->service && strcmp(service->service, "YouNow") == 0) {
|
||||
if (service->server && service->key) {
|
||||
return younow_get_ingest(service->server, service->key);
|
||||
}
|
||||
}
|
||||
|
||||
return service->server;
|
||||
}
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue