diff options
| author | Campbell Barton <ideasman42@gmail.com> | 2013-07-20 04:35:41 +0400 |
|---|---|---|
| committer | Campbell Barton <ideasman42@gmail.com> | 2013-07-20 04:35:41 +0400 |
| commit | a2a99bbc17e467281af835d170588588a06e6ab0 (patch) | |
| tree | 21ced1777f91d1cf5c2ec24817aeef0c1654d4a1 /intern/audaspace | |
| parent | e3c9fcd1bbcc2965c909b5c81bd133c851e5b1e7 (diff) | |
edit to r58425, BLI_math is available here, better not copy,paste from linearrgb_to_srgb.
also remove redundant check in AUD_FFMPEGReader::seek.
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp index 3d830df83e8..ba961f0cb78 100644 --- a/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp +++ b/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp @@ -347,10 +347,6 @@ void AUD_FFMPEGReader::seek(int position) uint64_t st_time = m_formatCtx->start_time; uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate); - if (seek_pos < 0) { - seek_pos = 0; - } - if (st_time != AV_NOPTS_VALUE) { seek_pos += st_time; } |