summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorQt Continuous Integration System <qt-info@nokia.com>2010-06-10 04:33:03 (GMT)
committerQt Continuous Integration System <qt-info@nokia.com>2010-06-10 04:33:03 (GMT)
commitbe68f6960f7665c715ea4cca90c2ea4ccae1e0fa (patch)
treeecc89ffe6654e7791f163b43b3bc67b2c4c44d77 /src
parentdf5b862b3a60f975c9a0cab0efe9247874baaa1a (diff)
parent558089fb21e7f388f9810c51abbd9bf3872b2178 (diff)
downloadQt-be68f6960f7665c715ea4cca90c2ea4ccae1e0fa.zip
Qt-be68f6960f7665c715ea4cca90c2ea4ccae1e0fa.tar.gz
Qt-be68f6960f7665c715ea4cca90c2ea4ccae1e0fa.tar.bz2
Merge branch '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging into 4.6-integration
* '4.6' of scm.dev.nokia.troll.no:qt/qt-multimedia-staging: QMovie cpu usage up to 100%
Diffstat (limited to 'src')
-rw-r--r--src/plugins/imageformats/gif/qgifhandler.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/imageformats/gif/qgifhandler.cpp b/src/plugins/imageformats/gif/qgifhandler.cpp
index 25d3dfa..56dac52 100644
--- a/src/plugins/imageformats/gif/qgifhandler.cpp
+++ b/src/plugins/imageformats/gif/qgifhandler.cpp
@@ -1026,7 +1026,7 @@ inline QRgb QGIFFormat::color(uchar index) const
QGifHandler::QGifHandler()
{
gifFormat = new QGIFFormat;
- nextDelay = 0;
+ nextDelay = 100;
loopCnt = 1;
frameNumber = -1;
scanIsCached = false;