From 9d88c10ca434dacdee0e98a2d33e7898be2dd223 Mon Sep 17 00:00:00 2001 From: BtbN Date: Fri, 9 May 2014 17:05:19 +0200 Subject: [PATCH] Fix multi-char constant warnings --- libobs/media-io/video-fourcc.c | 33 ++++++++++++++++++--------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/libobs/media-io/video-fourcc.c b/libobs/media-io/video-fourcc.c index 30460df41..a1c0e42f3 100644 --- a/libobs/media-io/video-fourcc.c +++ b/libobs/media-io/video-fourcc.c @@ -18,28 +18,31 @@ #include "../util/c99defs.h" #include "video-io.h" +#define MAKE_FOURCC(a, b, c, d) \ + ((uint32_t)(((d) << 24) | ((c) << 16) | ((b) << 8) | (a))) + enum video_format video_format_from_fourcc(uint32_t fourcc) { switch (fourcc) { - case 'UYVY': - case 'HDYC': - case 'UYNV': - case 'UYNY': - case 'uyv1': - case '2vuy': - case '2Vuy': + case MAKE_FOURCC('U','Y','V','Y'): + case MAKE_FOURCC('H','D','Y','C'): + case MAKE_FOURCC('U','Y','N','V'): + case MAKE_FOURCC('U','Y','N','Y'): + case MAKE_FOURCC('u','y','v','1'): + case MAKE_FOURCC('2','v','u','y'): + case MAKE_FOURCC('2','V','u','y'): return VIDEO_FORMAT_UYVY; - case 'YUY2': - case 'Y422': - case 'V422': - case 'VYUY': - case 'YUNV': - case 'yuv2': - case 'yuvs': + case MAKE_FOURCC('Y','U','Y','2'): + case MAKE_FOURCC('Y','4','2','2'): + case MAKE_FOURCC('V','4','2','2'): + case MAKE_FOURCC('V','Y','U','Y'): + case MAKE_FOURCC('Y','U','N','V'): + case MAKE_FOURCC('y','u','v','2'): + case MAKE_FOURCC('y','u','v','s'): return VIDEO_FORMAT_YUY2; - case 'YVYU': + case MAKE_FOURCC('Y','V','Y','U'): return VIDEO_FORMAT_YVYU; }