OBS/obs-studio
OBS/obs-studio
1
0
Fork 0
mirror of https://github.com/obsproject/obs-studio.git synced 2024-07-14 23:34:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

libobs, obs-scripting, vlc-video: Fix compiler warnings

Browse source
This commit is contained in:
Clayton Groeneveld 2019-07-15 06:51:30 -05:00
parent 5f7f2c1c97
commit e8ad89fc75
3 changed files with 7 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
deps/obs-scripting/obs-scripting-lua.c vendored
View file

@ -590,9 +590,11 @@ static int enum_sources(lua_State *script)
/* -------------------------------------------- */
static bool source_enum_filters_proc(obs_source_t *source, obs_source_t *filter,
static void source_enum_filters_proc(obs_source_t *source, obs_source_t *filter,
void *param)
{
UNUSED_PARAMETER(source);
lua_State *script = param;
obs_source_get_ref(filter);
@ -600,7 +602,6 @@ static bool source_enum_filters_proc(obs_source_t *source, obs_source_t *filter,
size_t idx = lua_rawlen(script, -2);
lua_rawseti(script, -2, (int)idx + 1);
return true;
}
static int source_enum_filters(lua_State *script)

2
libobs/obs-encoder.c
View file

@ -349,7 +349,7 @@ obs_properties_t *obs_get_encoder_properties(const char *id)
const struct obs_encoder_info *ei = find_encoder(id);
if (ei && (ei->get_properties || ei->get_properties2)) {
obs_data_t *defaults = get_defaults(ei);
obs_properties_t *properties;
obs_properties_t *properties = NULL;
if (ei->get_properties2) {
properties = ei->get_properties2(NULL, ei->type_data);

4
plugins/vlc-video/vlc-video-source.c
View file

@ -230,7 +230,9 @@ static inline unsigned get_format_lines(enum video_format format,
case VIDEO_FORMAT_BGRX:
case VIDEO_FORMAT_Y800:
return height;
case VIDEO_FORMAT_NONE:;
case VIDEO_FORMAT_NONE:
default:
break;
}
return 0;