comparison data/fileio/QuickTimeFileReader.cpp @ 383:94fc0591ea43 1.2-stable

* merge from trunk (1.2 ended up being tracked from trunk, but we may want this branch for fixes later)
author Chris Cannam
date Wed, 27 Feb 2008 10:32:45 +0000
parents 1afaf98dbf11
children 183ee2a55fc7
comparison
equal deleted inserted replaced
349:f39d33b0b265 383:94fc0591ea43
234 m_error = QString("Error in QuickTime decoding: code %1") 234 m_error = QString("Error in QuickTime decoding: code %1")
235 .arg(m_d->err); 235 .arg(m_d->err);
236 break; 236 break;
237 } 237 }
238 238
239 //!!! progress?
240
239 // std::cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << std::endl; 241 // std::cerr << "Read " << framesRead << " frames (block size " << m_d->blockSize << ")" << std::endl;
240 242
241 // QuickTime buffers are interleaved unless specified otherwise 243 // QuickTime buffers are interleaved unless specified otherwise
242 addSamplesToDecodeCache(m_d->data, framesRead); 244 addSamplesToDecodeCache(m_d->data, framesRead);
243 245