[FFmpeg-cvslog] Merge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat Oct 18 12:46:37 2014 +0200| [17d16008befa82cb79e71fbb4dc28fb4d9ec2ce6] | committer: Michael Niedermayer

Merge commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836'

* commit '6cbbf0592f4f3940aac7f687850d1b726a2ea836':
  resample: Avoid off-by-1 errors in PTS calcs.

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17d16008befa82cb79e71fbb4dc28fb4d9ec2ce6
---