diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 16:16:16 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-02-12 16:16:16 +0100 |
| commit | f73901f815d0c6e1e9dbe6d8541e43d633b06d63 (patch) | |
| tree | 4071c87ee47d8056cdd20bd8fe8a49d523e3ddf5 /COPYING.LGPLv2.1 | |
| parent | 5634c9518f07b6767894b8a9556a8c8527c207b2 (diff) | |
| parent | 0c082565965258dca143767cc6cb25e38b6e9ea3 (diff) | |
| download | ffmpeg-f73901f815d0c6e1e9dbe6d8541e43d633b06d63.tar.gz | |
Merge commit '0c082565965258dca143767cc6cb25e38b6e9ea3'
* commit '0c082565965258dca143767cc6cb25e38b6e9ea3':
asfdec: short-circuit seeking to the start of stream
Conflicts:
libavformat/asfdec.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'COPYING.LGPLv2.1')
0 files changed, 0 insertions, 0 deletions