diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 10:56:54 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-09-20 10:57:20 +0200 |
| commit | c16470d77a1b693ea573e2925c3488847c5db939 (patch) | |
| tree | 93b435242e547255018274a8c711d813318450b5 /libavformat/concatdec.c | |
| parent | f6622f9610af513bc3277da09dcd2d9777f00343 (diff) | |
| parent | 5f408333601a827054335f309defcb246a532b21 (diff) | |
| download | ffmpeg-c16470d77a1b693ea573e2925c3488847c5db939.tar.gz | |
Merge commit '5f408333601a827054335f309defcb246a532b21'
* commit '5f408333601a827054335f309defcb246a532b21':
asfdec: substract preroll time from marker presentation time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavformat/concatdec.c')
0 files changed, 0 insertions, 0 deletions