diff options
author | Edward Hervey <edward@centricular.com> | 2017-11-20 17:06:07 +0100 |
---|---|---|
committer | Edward Hervey <bilboed@bilboed.com> | 2017-11-20 17:06:07 +0100 |
commit | 4260f8a1204674253fc5003d78a7ee8a09d442d1 (patch) | |
tree | 7d435d0df6af09d33a569d6fe76fcb8550dfc200 /gst | |
parent | 538aae24042b0f6b241911d4dc707a56b34b4d1f (diff) | |
download | gstreamer-plugins-bad-4260f8a1204674253fc5003d78a7ee8a09d442d1.tar.gz |
all: Fix left-shift undefined behaviour
Cast to the target type before shifting (or use macro if available)
Diffstat (limited to 'gst')
-rw-r--r-- | gst/dvbsuboverlay/dvb-sub.c | 2 | ||||
-rw-r--r-- | gst/mxf/mxftypes.c | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/gst/dvbsuboverlay/dvb-sub.c b/gst/dvbsuboverlay/dvb-sub.c index cddb19ec9..2e6e48dde 100644 --- a/gst/dvbsuboverlay/dvb-sub.c +++ b/gst/dvbsuboverlay/dvb-sub.c @@ -54,7 +54,7 @@ static void dvb_sub_init (void); */ #define AYUV(y,u,v,a) (((a) << 24) | ((y) << 16) | ((u) << 8) | (v)) -#define RGBA_TO_AYUV(r,g,b,a) (((a) << 24) | ((rgb_to_y(r,g,b)) << 16) | ((rgb_to_u(r,g,b)) << 8) | (rgb_to_v(r,g,b))) +#define RGBA_TO_AYUV(r,g,b,a) ((((guint32)(a)) << 24) | ((rgb_to_y(r,g,b)) << 16) | ((rgb_to_u(r,g,b)) << 8) | (rgb_to_v(r,g,b))) typedef struct DVBSubCLUT diff --git a/gst/mxf/mxftypes.c b/gst/mxf/mxftypes.c index ba7704b8c..e077f3f23 100644 --- a/gst/mxf/mxftypes.c +++ b/gst/mxf/mxftypes.c @@ -250,9 +250,7 @@ mxf_uuid_hash (const MXFUUID * uuid) g_return_val_if_fail (uuid != NULL, 0); for (i = 0; i < 4; i++) - ret ^= (uuid->u[i * 4 + 0] << 24) | - (uuid->u[i * 4 + 1] << 16) | - (uuid->u[i * 4 + 2] << 8) | (uuid->u[i * 4 + 3] << 0); + ret ^= GST_READ_UINT32_BE (uuid->u + i * 4); return ret; } |