diff options
author | aavit <qt-info@nokia.com> | 2010-03-31 12:00:03 (GMT) |
---|---|---|
committer | aavit <qt-info@nokia.com> | 2010-03-31 12:00:03 (GMT) |
commit | 85313fec454f77322deb7041726573e14f6a262a (patch) | |
tree | e0151a738a3acc91e16411869e160042e63bbc9a /src/3rdparty/phonon/gstreamer/gsthelper.cpp | |
parent | 2fe059c863377befdcf65084a07a7f4841beef0d (diff) | |
parent | 93ae014d7ee06a6ebb701420fffef5895cd731c4 (diff) | |
download | Qt-85313fec454f77322deb7041726573e14f6a262a.zip Qt-85313fec454f77322deb7041726573e14f6a262a.tar.gz Qt-85313fec454f77322deb7041726573e14f6a262a.tar.bz2 |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/oslo-staging-2 into 4.7
Diffstat (limited to 'src/3rdparty/phonon/gstreamer/gsthelper.cpp')
-rw-r--r-- | src/3rdparty/phonon/gstreamer/gsthelper.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/3rdparty/phonon/gstreamer/gsthelper.cpp b/src/3rdparty/phonon/gstreamer/gsthelper.cpp index 34d99fa..69bb75c 100644 --- a/src/3rdparty/phonon/gstreamer/gsthelper.cpp +++ b/src/3rdparty/phonon/gstreamer/gsthelper.cpp @@ -121,7 +121,7 @@ GstElement* GstHelper::createPluggablePlaybin() { GstElement *playbin = 0; //init playbin and add to our pipeline - playbin = gst_element_factory_make("playbin", NULL); + playbin = gst_element_factory_make("playbin2", NULL); //Create an identity element to redirect sound GstElement *audioSinkBin = gst_bin_new (NULL); |