[FFmpeg-cvslog] Merge commit '5c337353a2546416631a87de4881850d99141c39'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Mar 19 13:26:44 2015 +0100| [25d7e3ad594a8b5ed1b840d75185df34efdde6ad] | committer: Michael Niedermayer

Merge commit '5c337353a2546416631a87de4881850d99141c39'

* commit '5c337353a2546416631a87de4881850d99141c39':
  movenc: Move sidx edit list timestamp adjustment into a block

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

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