diff options
| author | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-02-05 23:53:17 +0530 |
|---|---|---|
| committer | Nirbheek Chauhan <nirbheek@centricular.com> | 2019-02-06 00:10:28 +0530 |
| commit | fffb2aa12f1c9844a60bd58d43407f8ccfc2dbb0 (patch) | |
| tree | 983c23c2af7561b3c038860d8b803acecb7212e4 /sys | |
| parent | 6c953438f5ad9ab78114bf3d9e5a6e9b1d913b80 (diff) | |
| download | gstreamer-plugins-bad-fffb2aa12f1c9844a60bd58d43407f8ccfc2dbb0.tar.gz | |
misc: Fix warnings on Cerbero MinGW
gstladspa.c:360:5: error: zero-length ms_printf format string [-Werror=format-zero-length]
vad_private.c:108:3: error: this decimal constant is unsigned only in ISO C90 [-Werror]
gstdecklinkvideosink.cpp:478:32: error: comparison between 'BMDTimecodeFormat {aka enum _BMDTimecodeFormat}' and 'enum GstDecklinkTimecodeFormat' [-Werror=enum-compare]
win/DeckLinkAPI_i.c:72:8: error: extra tokens at end of #endif directive [-Werror]
win/DeckLinkAPIDispatch.cpp:35:10: error: unused variable 'res' [-Werror=unused-variable]
gstwasapiutil.c:733:3: error: format '%x' expects argument of type 'unsigned int', but argument 8 has type 'DWORD' [-Werror=format]
gstwasapiutil.c:733:3: error: format '%x' expects argument of type 'unsigned int', but argument 9 has type 'guint64' [-Werror=format]
kshelpers.c:446:3: error: missing braces around initializer [-Werror=missing-braces]
kshelpers.c:446:3: error: (near initialization for 'known_property_sets[0].guid.Data4') [-Werror=missing-braces]
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/decklink/gstdecklinkvideosink.cpp | 4 | ||||
| -rw-r--r-- | sys/decklink/win/DeckLinkAPIDispatch.cpp | 4 | ||||
| -rw-r--r-- | sys/decklink/win/DeckLinkAPI_i.c | 2 | ||||
| -rw-r--r-- | sys/wasapi/gstwasapiutil.c | 3 | ||||
| -rw-r--r-- | sys/winks/kshelpers.c | 6 |
5 files changed, 13 insertions, 6 deletions
diff --git a/sys/decklink/gstdecklinkvideosink.cpp b/sys/decklink/gstdecklinkvideosink.cpp index 3295c3a5f..817d870db 100644 --- a/sys/decklink/gstdecklinkvideosink.cpp +++ b/sys/decklink/gstdecklinkvideosink.cpp @@ -475,8 +475,8 @@ gst_decklink_video_sink_set_caps (GstBaseSink * bsink, GstCaps * caps) * Note that this flag will have no effect in practice if the video stream * does not contain timecode metadata. */ - if (self->timecode_format == GST_DECKLINK_TIMECODE_FORMAT_VITC || - self->timecode_format == GST_DECKLINK_TIMECODE_FORMAT_VITCFIELD2) + if ((gint64) self->timecode_format == (gint64) GST_DECKLINK_TIMECODE_FORMAT_VITC || + (gint64) self->timecode_format == (gint64) GST_DECKLINK_TIMECODE_FORMAT_VITCFIELD2) flags = bmdVideoOutputVITC; else flags = bmdVideoOutputRP188; diff --git a/sys/decklink/win/DeckLinkAPIDispatch.cpp b/sys/decklink/win/DeckLinkAPIDispatch.cpp index d06c59f1d..4a6c22764 100644 --- a/sys/decklink/win/DeckLinkAPIDispatch.cpp +++ b/sys/decklink/win/DeckLinkAPIDispatch.cpp @@ -32,9 +32,9 @@ extern "C" { IDeckLinkIterator* CreateDeckLinkIteratorInstance (void)
{
IDeckLinkIterator *deckLinkIterator = NULL;
- HRESULT res = CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_ALL,
+ CoCreateInstance(CLSID_CDeckLinkIterator, NULL, CLSCTX_ALL,
IID_IDeckLinkIterator, (void**)&deckLinkIterator);
return deckLinkIterator;
}
-};
\ No newline at end of file +};
diff --git a/sys/decklink/win/DeckLinkAPI_i.c b/sys/decklink/win/DeckLinkAPI_i.c index 5bec7f591..dadf79912 100644 --- a/sys/decklink/win/DeckLinkAPI_i.c +++ b/sys/decklink/win/DeckLinkAPI_i.c @@ -69,7 +69,7 @@ typedef IID CLSID; #define MIDL_DEFINE_GUID(type,name,l,w1,w2,b1,b2,b3,b4,b5,b6,b7,b8) \
const type name = {l,w1,w2,{b1,b2,b3,b4,b5,b6,b7,b8}}
-#endif !_MIDL_USE_GUIDDEF_
+#endif // !_MIDL_USE_GUIDDEF_
MIDL_DEFINE_GUID(IID, LIBID_DeckLinkAPI,0xD864517A,0xEDD5,0x466D,0x86,0x7D,0xC8,0x19,0xF1,0xC0,0x52,0xBB);
diff --git a/sys/wasapi/gstwasapiutil.c b/sys/wasapi/gstwasapiutil.c index 2e191f496..94de63835 100644 --- a/sys/wasapi/gstwasapiutil.c +++ b/sys/wasapi/gstwasapiutil.c @@ -730,7 +730,8 @@ gst_wasapi_util_waveformatex_to_channel_mask (WAVEFORMATEXTENSIBLE * format, /* XXX: Warn if some channel masks couldn't be mapped? */ - GST_DEBUG ("Converted WASAPI mask 0x%x -> 0x%x", dwChannelMask, mask); + GST_DEBUG ("Converted WASAPI mask 0x%" G_GINT64_MODIFIER "x -> 0x%" + G_GINT64_MODIFIER "x", (guint64) dwChannelMask, (guint64) mask); out: if (out_position) diff --git a/sys/winks/kshelpers.c b/sys/winks/kshelpers.c index 2ffb7547c..80bb4775b 100644 --- a/sys/winks/kshelpers.c +++ b/sys/winks/kshelpers.c @@ -442,6 +442,12 @@ typedef struct 0x9B496CE1, 0x811B, 0x11cf, { 0x8C, 0x77, 0x00, 0xAA, 0x00, 0x6B, 0x68, 0x14 } #endif +/* GCC warns about this, but it seems to be correct and MSVC doesn't warn about + * it. XXX: Check again after the toolchain is updated: + * https://gitlab.freedesktop.org/gstreamer/cerbero/merge_requests/69 */ +#ifdef __GNUC__ +#pragma GCC diagnostic ignored "-Wmissing-braces" +#endif static const KsPropertySetMapping known_property_sets[] = { {{STATIC_KSPROPSETID_General}, "General"}, {{STATIC_KSPROPSETID_MediaSeeking}, "MediaSeeking"}, |