Browse Source

libobs, obs-x264: Fix compiler warnings

Clayton Groeneveld 5 years ago
parent
commit
4e3a0180ba

+ 2 - 1
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";

+ 2 - 2
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)

+ 1 - 0
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:;
 	}