jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3175 from cg2121/fix-warnings

Browse Source 
UI, obs-ffmpeg, obs-filters: Fix compile warnings
This commit is contained in:
Jim 2020-07-18 08:32:49 -07:00 committed by GitHub
commit 934cff582a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
UI/window-basic-settings.cpp
View File

@ -76,6 +76,8 @@ protected:
if (key == Qt::Key_Escape) {
return false;
}
default:
break;
}
return shortcutFilter->filter(obj, event);

2
UI/window-basic-status-bar.cpp
View File

@ -13,8 +13,8 @@ OBSBasicStatusBar::OBSBasicStatusBar(QWidget *parent)
droppedFrames(new QLabel),
streamIcon(new QLabel),
streamTime(new QLabel),
recordIcon(new QLabel),
recordTime(new QLabel),
recordIcon(new QLabel),
cpuUsage(new QLabel),
transparentPixmap(20, 20),
greenPixmap(20, 20),

4
plugins/obs-ffmpeg/obs-ffmpeg-mux.c
View File

@ -556,7 +556,7 @@ struct obs_output_info ffmpeg_muxer = {
.get_properties = ffmpeg_mux_properties,
};
static int connect_time(struct ffmpeg_mux *stream)
static int connect_time(struct ffmpeg_muxer *stream)
{
UNUSED_PARAMETER(stream);
/* TODO */
@ -565,7 +565,7 @@ static int connect_time(struct ffmpeg_mux *stream)
static int ffmpeg_mpegts_mux_connect_time(void *data)
{
struct ffmpeg_mux *stream = data;
struct ffmpeg_muxer *stream = data;
/* TODO */
return connect_time(stream);
}

2
plugins/obs-filters/color-grade-filter.c
View File

@ -454,6 +454,8 @@ static void color_grade_filter_render(void *data, gs_effect_t *effect)
obs_source_process_filter_tech_end(filter->context, filter->effect, 0,
0, tech_name);
UNUSED_PARAMETER(effect);
}
struct obs_source_info color_grade_filter = {