From 4e3a0180baa3382c7e51cb6278049012f603de2a Mon Sep 17 00:00:00 2001 From: Clayton Groeneveld Date: Tue, 21 Jan 2020 15:18:09 -0600 Subject: [PATCH] libobs, obs-x264: Fix compiler warnings --- libobs/media-io/video-io.h | 3 ++- libobs/media-io/video-scaler-ffmpeg.c | 4 ++-- plugins/obs-x264/obs-x264.c | 1 + 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/libobs/media-io/video-io.h b/libobs/media-io/video-io.h index 6eb986826..fc2a3cb98 100644 --- a/libobs/media-io/video-io.h +++ b/libobs/media-io/video-io.h @@ -177,7 +177,8 @@ static inline const char *get_video_colorspace_name(enum video_colorspace cs) case VIDEO_CS_709: return "709"; case VIDEO_CS_601: - case VIDEO_CS_DEFAULT:; + case VIDEO_CS_DEFAULT: + case VIDEO_CS_SRGB:; } return "601"; diff --git a/libobs/media-io/video-scaler-ffmpeg.c b/libobs/media-io/video-scaler-ffmpeg.c index 5ee389ccd..493b7aa37 100644 --- a/libobs/media-io/video-scaler-ffmpeg.c +++ b/libobs/media-io/video-scaler-ffmpeg.c @@ -94,9 +94,9 @@ static inline const int *get_ffmpeg_coeffs(enum video_colorspace cs) return sws_getCoefficients(SWS_CS_ITU601); case VIDEO_CS_709: return sws_getCoefficients(SWS_CS_ITU709); + default: + return sws_getCoefficients(SWS_CS_ITU601); } - - return sws_getCoefficients(SWS_CS_ITU601); } static inline int get_ffmpeg_range_type(enum video_range_type type) diff --git a/plugins/obs-x264/obs-x264.c b/plugins/obs-x264/obs-x264.c index a5e318c7a..2db39408c 100644 --- a/plugins/obs-x264/obs-x264.c +++ b/plugins/obs-x264/obs-x264.c @@ -367,6 +367,7 @@ static inline const char *get_x264_colorspace_name(enum video_colorspace cs) switch (cs) { case VIDEO_CS_DEFAULT: case VIDEO_CS_601: + case VIDEO_CS_SRGB: return "undef"; case VIDEO_CS_709:; } -- GitLab