diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-04-15 09:26:14 +0200 |
| commit | 1925bb404ec47b6e074c5e3b334fe0be12176d7b (patch) | |
| tree | 8d7d79ac1b3a549c20bb4fa77c6f457bf1bb61ea /src/gsttools | |
| parent | 6187b72c51d0c05955d9d814baf8866b8e70fcfe (diff) | |
| parent | f9145aca166ad2ca1514524ce88ded7834eb207c (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5
Conflicts:
src/multimedia/playback/playlistfileparser.cpp
src/plugins/windowsaudio/qwindowsaudiodeviceinfo.cpp
Change-Id: I52950def2b8283ae15797d05d4ead6a1256eba19
Diffstat (limited to 'src/gsttools')
| -rw-r--r-- | src/gsttools/qgstreamervideowidget.cpp | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/src/gsttools/qgstreamervideowidget.cpp b/src/gsttools/qgstreamervideowidget.cpp index 5261ccb86..9a29d327f 100644 --- a/src/gsttools/qgstreamervideowidget.cpp +++ b/src/gsttools/qgstreamervideowidget.cpp @@ -100,9 +100,6 @@ QGstreamerVideoWidgetControl::QGstreamerVideoWidgetControl(QObject *parent) { m_videoSink = gst_element_factory_make ("xvimagesink", NULL); - if (!m_videoSink) - m_videoSink = gst_element_factory_make ("ximagesink", NULL); - if (m_videoSink) { // Check if the xv sink is usable if (gst_element_set_state(m_videoSink, GST_STATE_READY) != GST_STATE_CHANGE_SUCCESS) { |