diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-02-13 13:10:48 +0100 |
| commit | f9014d136f504c6377d1329c822f11a8b58ccdbe (patch) | |
| tree | 1c1a752d8ba6b5094b182305d65ca0d0101e1ed0 /src/plugins/wmf | |
| parent | bbfccc713546f9e7341fbe1af7482cafbdc4ea25 (diff) | |
| parent | 06259f1dfbd9cb2ebd58bba59381a42dc8a758df (diff) | |
| download | qtmultimedia-f9014d136f504c6377d1329c822f11a8b58ccdbe.tar.gz | |
Merge remote-tracking branch 'origin/5.4' into dev
Change-Id: I5575a4ba13212c9bfe73a3de3ef17c6528beafc3
Diffstat (limited to 'src/plugins/wmf')
| -rw-r--r-- | src/plugins/wmf/player/mfplayersession.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/plugins/wmf/player/mfplayersession.cpp b/src/plugins/wmf/player/mfplayersession.cpp index 7da5f7752..677d248b2 100644 --- a/src/plugins/wmf/player/mfplayersession.cpp +++ b/src/plugins/wmf/player/mfplayersession.cpp @@ -1296,7 +1296,7 @@ void MFPlayerSession::commitRateChange(qreal rate, BOOL isThin) // (which might be earlier than the last decoded key frame) resetPosition = true; } else if (cmdNow == CmdPause) { - // If paused, dont reset the position until we resume, otherwise + // If paused, don't reset the position until we resume, otherwise // a new frame will be rendered m_presentationClock->GetCorrelatedTime(0, &hnsClockTime, &hnsSystemTime); m_request.setCommand(CmdSeekResume); |