[FFmpeg-cvslog] Merge commit '5f408333601a827054335f309defcb246a532b21'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Sep 20 10:56:54 2013 +0200| [c16470d77a1b693ea573e2925c3488847c5db939] | committer: Michael Niedermayer

Merge commit '5f408333601a827054335f309defcb246a532b21'

* commit '5f408333601a827054335f309defcb246a532b21':
  asfdec: substract preroll time from marker presentation time

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

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