morgan/FreeRDP
1
0
Fork 0
mirror of https://github.com/morgan9e/FreeRDP synced 2026-04-15 08:54:38 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #4021 from scroogie/master

Browse Source 
Fix compilation on RHEL 6.x by macro-guarding two functions
This commit is contained in:
David Fort
2017-07-07 15:08:06 +02:00
committed by GitHub
parent 93e5b0647a 512d8a8dec
commit ccf9b0a77b
2 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
channels/tsmf/client/gstreamer/tsmf_X11.c
View File

@@ -109,7 +109,11 @@ static GstBusSyncReply tsmf_platform_bus_sync_handler(GstBus *bus, GstMessage *m
gst_video_overlay_handle_events(hdl->overlay, TRUE);
#else
hdl->overlay = GST_X_OVERLAY (GST_MESSAGE_SRC (message));
#if GST_CHECK_VERSION(0,10,31)
gst_x_overlay_set_window_handle(hdl->overlay, hdl->subwin);
#else
gst_x_overlay_set_xwindow_id(hdl->overlay, hdl->subwin);
#endif
gst_x_overlay_handle_events(hdl->overlay, TRUE);
#endif

4
channels/tsmf/client/gstreamer/tsmf_gstreamer.c
View File

@@ -1020,10 +1020,14 @@ ITSMFDecoder* freerdp_tsmf_client_subsystem_entry(void)
{
TSMFGstreamerDecoder *decoder;
#if GST_CHECK_VERSION(0,10,31)
if (!gst_is_initialized())
{
gst_init(NULL, NULL);
}
#else
gst_init(NULL, NULL);
#endif
decoder = calloc(1, sizeof(TSMFGstreamerDecoder));