diff options
| author | Alejandro Marzini | 2010-07-30 05:28:09 +0000 |
|---|---|---|
| committer | Alejandro Marzini | 2010-07-30 05:28:09 +0000 |
| commit | fb4086cadb8ce3e473dae40558d713e7a31b3858 (patch) | |
| tree | 95c19d544da914c43a43f0538a1977f43e17cb39 /sound/audiostream.cpp | |
| parent | 7b070bbef8275ff25dfc2cbc3106acfdc8de74a5 (diff) | |
| parent | a17e3c444917ca90dfd537c2102a6150e7ffe977 (diff) | |
| download | scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.tar.gz scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.tar.bz2 scummvm-rg350-fb4086cadb8ce3e473dae40558d713e7a31b3858.zip | |
Merged from trunk, from Rev 50841 to HEAD
svn-id: r51495
Diffstat (limited to 'sound/audiostream.cpp')
| -rw-r--r-- | sound/audiostream.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/sound/audiostream.cpp b/sound/audiostream.cpp index a092e6c29d..b3efb2cefe 100644 --- a/sound/audiostream.cpp +++ b/sound/audiostream.cpp @@ -393,7 +393,7 @@ Timestamp convertTimeToStreamPos(const Timestamp &where, int rate, bool isStereo // // An example is when converting the timestamp 500ms to a 11025 Hz based // stream. It would have an internal frame counter of 5512.5. Now when - // doing calculations at frame precision, this might lead to unexpected + // doing calculations at frame precision, this might lead to unexpected // results: The frame difference between a timestamp 1000ms and the above // mentioned timestamp (both with 11025 as framerate) would be 5512, // instead of 5513, which is what a frame-precision based code would expect. |