diff options
| author | Martin Jones <martin.jones@nokia.com> | 2010-03-31 06:45:31 (GMT) |
|---|---|---|
| committer | Martin Jones <martin.jones@nokia.com> | 2010-03-31 06:45:31 (GMT) |
| commit | b6a0595e6479138b9d58c499f4285b357e81b2eb (patch) | |
| tree | 2e10e8a59ae55f75e44b67a310103a084e8d169f /src/3rdparty/phonon/gstreamer/gsthelper.cpp | |
| parent | e178cf86ff5007d5af31181d064b1bf824ffbc33 (diff) | |
| parent | a795a55cf2796a44cf30e002962ebad0588ef740 (diff) | |
| download | Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.zip Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.tar.gz Qt-b6a0595e6479138b9d58c499f4285b357e81b2eb.tar.bz2 | |
Merge branch '4.7' of scm.dev.nokia.troll.no:qt/qt-qml 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); |