diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-26 18:06:52 +1000 |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2011-05-26 18:06:52 +1000 |
| commit | dfa9347dcf15d245b70fb592c52d20ebc4155090 (patch) | |
| tree | 558e9d09984f7937d0bfb704b3d428565af1b6ec | |
| parent | a8d0bdd6b76fefaaa822c446a8b47e273d93c6ba (diff) | |
| parent | 72c144b20eb4b335e6d2d5269e98db142ac0a6c6 (diff) | |
Merge branch '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia into 1.1-integration
* '1.1' of scm.dev.nokia.troll.no:qtmobility/qtm-multimedia:
Fix a crash bug in mediaplayer gstreamer backend.
| -rw-r--r-- | plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp index 62c1403a7d..f407e0e663 100644 --- a/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp +++ b/plugins/multimedia/gstreamer/mediaplayer/qgstreamerplayersession.cpp @@ -1435,15 +1435,15 @@ void QGstreamerPlayerSession::playbinNotifySource(GObject *o, GParamSpec *p, gpo //set timeout property to 5 seconds if (qstrcmp(G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(source)), "GstUDPSrc") == 0) { //udpsrc timeout unit = microsecond - g_object_set(G_OBJECT(source), "timeout", 5000000, NULL); + g_object_set(G_OBJECT(source), "timeout", G_GUINT64_CONSTANT(5000000), NULL); self->m_sourceType = UDPSrc; } else if (qstrcmp(G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(source)), "GstSoupHTTPSrc") == 0) { //souphttpsrc timeout unit = second - g_object_set(G_OBJECT(source), "timeout", 5, NULL); + g_object_set(G_OBJECT(source), "timeout", guint(5), NULL); self->m_sourceType = SoupHTTPSrc; } else if (qstrcmp(G_OBJECT_CLASS_NAME(G_OBJECT_GET_CLASS(source)), "GstMMSSrc") == 0) { self->m_sourceType = MMSSrc; - g_object_set(G_OBJECT(source), "tcp-timeout", 5000000, NULL); + g_object_set(G_OBJECT(source), "tcp-timeout", G_GUINT64_CONSTANT(5000000), NULL); } else { self->m_sourceType = UnknownSrc; } |