Merge commit '5f408333601a827054335f309defcb246a532b21'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 08:56:54 +0000 (10:56 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 20 Sep 2013 08:57:20 +0000 (10:57 +0200)
commitc16470d77a1b693ea573e2925c3488847c5db939
tree93b435242e547255018274a8c711d813318450b5
parentf6622f9610af513bc3277da09dcd2d9777f00343
parent5f408333601a827054335f309defcb246a532b21
Merge commit '5f408333601a827054335f309defcb246a532b21'

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/asfdec.c