diff options
| author | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 00:19:16 (GMT) |
|---|---|---|
| committer | Qt Continuous Integration System <qt-info@nokia.com> | 2010-07-02 00:19:16 (GMT) |
| commit | 1a38ba1dcd7629f74bcaed48793dff441c16dc8b (patch) | |
| tree | cbe43b7bc41a6b083f05cdfcbf93b52de7b5b709 /src | |
| parent | 574e0e970abef087bc0b4040514cb1393b24e315 (diff) | |
| parent | 6d5e561be6f013f7cb5c77e15ee6b7640cad7563 (diff) | |
| download | Qt-1a38ba1dcd7629f74bcaed48793dff441c16dc8b.zip Qt-1a38ba1dcd7629f74bcaed48793dff441c16dc8b.tar.gz Qt-1a38ba1dcd7629f74bcaed48793dff441c16dc8b.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:
Segmentation Fault in QAudioOutputPrivate::freeBlocks() caused by wrong
Diffstat (limited to 'src')
| -rw-r--r-- | src/multimedia/audio/qaudioinput_win32_p.cpp | 2 | ||||
| -rw-r--r-- | src/multimedia/audio/qaudiooutput_win32_p.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/multimedia/audio/qaudioinput_win32_p.cpp b/src/multimedia/audio/qaudioinput_win32_p.cpp index 8240047..3f6e778 100644 --- a/src/multimedia/audio/qaudioinput_win32_p.cpp +++ b/src/multimedia/audio/qaudioinput_win32_p.cpp @@ -148,7 +148,7 @@ void QAudioInputPrivate::freeBlocks(WAVEHDR* blockArray) for(int i = 0; i < count; i++) { waveInUnprepareHeader(hWaveIn,blocks, sizeof(WAVEHDR)); - blocks+=sizeof(WAVEHDR); + blocks++; } HeapFree(GetProcessHeap(), 0, blockArray); } diff --git a/src/multimedia/audio/qaudiooutput_win32_p.cpp b/src/multimedia/audio/qaudiooutput_win32_p.cpp index 075d100..09771b3 100644 --- a/src/multimedia/audio/qaudiooutput_win32_p.cpp +++ b/src/multimedia/audio/qaudiooutput_win32_p.cpp @@ -193,7 +193,7 @@ void QAudioOutputPrivate::freeBlocks(WAVEHDR* blockArray) for(int i = 0; i < count; i++) { waveOutUnprepareHeader(hWaveOut,blocks, sizeof(WAVEHDR)); - blocks+=sizeof(WAVEHDR); + blocks++; } HeapFree(GetProcessHeap(), 0, blockArray); } |