← Back to branch summary

~siretart/ubuntu/utopic/blender/libav10

« back to all changes in this revision

Viewing changes to intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp

  • Committer: Package Import Robot
  • Author(s): Matthias Klose
  • Date: 2014-02-19 11:24:23 UTC
  • mfrom: (14.2.23 sid)
  • Revision ID: package-import@ubuntu.com-20140219112423-rkmaz2m7ha06d4tk
Tags: 2.69-3ubuntu1
* Merge with Debian; remaining changes:
  - Configure without OpenImageIO on armhf, as it is not available on
    Ubuntu.

Show diffs side-by-side

added added

removed removed

Lines of Context:
intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
347
347
                uint64_t st_time = m_formatCtx->start_time;
348
348
                uint64_t seek_pos = ((uint64_t)position) * ((uint64_t)AV_TIME_BASE) / ((uint64_t)m_specs.rate);
349
349
 
350
 
                if (seek_pos < 0) {
351
 
                        seek_pos = 0;
352
 
                }
353
 
 
354
350
                if (st_time != AV_NOPTS_VALUE) {
355
351
                        seek_pos += st_time;
356
352
                }