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

Merge pull request #2336 from cg2121/fix-warnings 

libobs, obs-x264: Fix compiler warnings
master
Jim 2020-01-22 00:42:23 -08:00 committed by GitHub
parent 432770342a 4e3a0180ba
commit 44dc06ede4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libobs/media-io/video-io.h
View File

@ -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";

4
libobs/media-io/video-scaler-ffmpeg.c
View File

@ -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
plugins/obs-x264/obs-x264.c
View File

@ -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:;
}