Merge pull request #2055 from jpark37/video-warnings

Fix video format warnings
This commit is contained in:
Jim
2019-08-31 21:16:23 -07:00
committed by GitHub
4 changed files with 32 additions and 17 deletions

View File

@@ -11,16 +11,12 @@ static inline enum AVPixelFormat
obs_to_ffmpeg_video_format(enum video_format format)
{
switch (format) {
case VIDEO_FORMAT_NONE:
return AV_PIX_FMT_NONE;
case VIDEO_FORMAT_I444:
return AV_PIX_FMT_YUV444P;
case VIDEO_FORMAT_I420:
return AV_PIX_FMT_YUV420P;
case VIDEO_FORMAT_NV12:
return AV_PIX_FMT_NV12;
case VIDEO_FORMAT_YVYU:
return AV_PIX_FMT_NONE;
case VIDEO_FORMAT_YUY2:
return AV_PIX_FMT_YUYV422;
case VIDEO_FORMAT_UYVY:
@@ -43,6 +39,11 @@ obs_to_ffmpeg_video_format(enum video_format format)
return AV_PIX_FMT_YUVA422P;
case VIDEO_FORMAT_YUVA:
return AV_PIX_FMT_YUVA444P;
case VIDEO_FORMAT_NONE:
case VIDEO_FORMAT_YVYU:
case VIDEO_FORMAT_AYUV:
/* not supported by FFmpeg */
return AV_PIX_FMT_NONE;
}
return AV_PIX_FMT_NONE;