From 6288f8e2e60e8a5f4db712a11c0c1cffd1a76a01 Mon Sep 17 00:00:00 2001 From: Vadim Zeitlin Date: Sat, 22 Apr 2017 16:30:36 +0200 Subject: [PATCH] Add dummy wxGStreamerMediaBackend::QueryVideoSizeFromElement() This is not used, but having it avoids warnings about breaking ABI compatibility with 3.0.2 when using GStreamer 1.0 in 3.0.3. --- src/unix/mediactrl.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/src/unix/mediactrl.cpp b/src/unix/mediactrl.cpp index edc8f943f4..928648fd6e 100644 --- a/src/unix/mediactrl.cpp +++ b/src/unix/mediactrl.cpp @@ -693,7 +693,18 @@ bool wxGStreamerMediaBackend::QueryVideoSizeFromElement(GstElement* element) return true; } -#endif +#else // GStreamer 1.0 + +// This method is unused, but still provide just to avoid warnings about ABI +// incompatible changes compared to the previous versions, in which it always +// existed. +bool +wxGStreamerMediaBackend::QueryVideoSizeFromElement(GstElement* WXUNUSED(element)) +{ + return false; +} + +#endif // GStreamer 0.x/1.0 //----------------------------------------------------------------------------- // wxGStreamerMediaBackend::QueryVideoSizeFromPad