[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [phonon-gstreamer/1.0-porting-for-merge] gstreamer: Merge remote-tracking branch 'origin/4.7' into 1
From:       Rohan Garg <rohan () kde ! org>
Date:       2014-04-03 13:14:00
Message-ID: E1WVhSy-0003fe-OA () scm ! kde ! org
[Download RAW message or body]

Git commit 04fcf1f0f8d19c87b9a3113bdc793424a3784a83 by Rohan Garg.
Committed on 02/04/2014 at 14:26.
Pushed by garg into branch '1.0-porting-for-merge'.

Merge remote-tracking branch 'origin/4.7' into 1.0-porting-for-merge
Fix build

Conflicts:
	gstreamer/plugininstaller.cpp

M  +25   -5    gstreamer/CMakeLists.txt
M  +0    -1    gstreamer/mediaobject.cpp
M  +3    -3    gstreamer/plugininstaller.cpp
M  +3    -0    gstreamer/x11renderer.cpp

http://commits.kde.org/phonon-gstreamer/04fcf1f0f8d19c87b9a3113bdc793424a37=
84a83

diff --cc gstreamer/x11renderer.cpp
index 6bd9f5e,a8e922b..b2597f0
--- a/gstreamer/x11renderer.cpp
+++ b/gstreamer/x11renderer.cpp
@@@ -201,18 -187,9 +203,19 @@@ void X11Renderer::windowExposed(
  //     QApplication::syncX();
  #else
      QApplication::syncX();
 -#endif
 -    if (m_videoSink && GST_IS_X_OVERLAY(m_videoSink))
 +    if (m_videoSink &&
 +        #if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
 +            GST_IS_X_OVERLAY(m_videoSink)
 +        #else
 +            GST_IS_VIDEO_OVERLAY(m_videoSink)
 +        #endif
 +            )
 +#if GST_VERSION < GST_VERSION_CHECK (1,0,0,0)
          gst_x_overlay_expose(GST_X_OVERLAY(m_videoSink));
 +#else
 +        gst_video_overlay_expose(GST_VIDEO_OVERLAY(m_videoSink));
 +#endif
++#endif //QT_VERSION
  }
  =

  }

[prev in list] [next in list] [prev in thread] [next in thread]