Changeset 74961 in webkit


Ignore:
Timestamp:
Jan 4, 2011 1:12:49 AM (13 years ago)
Author:
Philippe Normand
Message:

2011-01-03 Philippe Normand <pnormand@igalia.com>

Rubber-stamped by Eric Seidel.

[GStreamer] build fails with gstreamer core 0.10.31 and -plugins-base 0.10.30
https://bugs.webkit.org/show_bug.cgi?id=51810

Based on a patch by Mart Raudsepp.

No new tests, build fix only.

  • platform/graphics/gstreamer/GStreamerGWorld.cpp: (WebCore::GStreamerGWorld::setWindowOverlay): Use the new xoverlay API if the GST_CHECK_PLUGINS_BASE_VERSION macro is defined. It was introduced in same version as the xoverlay API change.
Location:
trunk/WebCore
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/WebCore/ChangeLog

    r74960 r74961  
     12011-01-03  Philippe Normand  <pnormand@igalia.com>
     2
     3        Rubber-stamped by Eric Seidel.
     4
     5        [GStreamer] build fails with gstreamer core 0.10.31 and -plugins-base 0.10.30
     6        https://bugs.webkit.org/show_bug.cgi?id=51810
     7
     8        Based on a patch by Mart Raudsepp.
     9
     10        No new tests, build fix only.
     11
     12        * platform/graphics/gstreamer/GStreamerGWorld.cpp:
     13        (WebCore::GStreamerGWorld::setWindowOverlay): Use the new xoverlay
     14        API if the GST_CHECK_PLUGINS_BASE_VERSION macro is defined. It was
     15        introduced in same version as the xoverlay API change.
     16
    1172011-01-04  Leo Yang  <leo.yang@torchmobile.com.cn>
    218
  • trunk/WebCore/platform/graphics/gstreamer/GStreamerGWorld.cpp

    r73457 r74961  
    211211    if (m_videoWindow) {
    212212        m_videoWindow->prepareForOverlay(message);
    213 #if GST_CHECK_VERSION(0, 10, 31) || GST_VERSION_NANO
     213
     214// gst_x_overlay_set_window_handle was introduced in -plugins-base
     215// 0.10.31, just like the macro for checking the version.
     216#ifdef GST_CHECK_PLUGINS_BASE_VERSION
    214217        gst_x_overlay_set_window_handle(GST_X_OVERLAY(sink), m_videoWindow->videoWindowId());
    215218#else
Note: See TracChangeset for help on using the changeset viewer.