diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-09-15 22:31:43 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-09-15 22:39:31 +0200 |
| commit | 21561610560fbde5a398d467b6d061ab3ac1c62e (patch) | |
| tree | 58a99f6b7420f288266df26e5f458745551069fd /libswscale/input.c | |
| parent | f685f7d7a8386365f452cc38c546327f7df20296 (diff) | |
| parent | 00431bf874e1044b01e09a2266ef85d4ff8d44cc (diff) | |
| download | ffmpeg-21561610560fbde5a398d467b6d061ab3ac1c62e.tar.gz | |
Merge commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc'
* commit '00431bf874e1044b01e09a2266ef85d4ff8d44cc':
ismindex: handle time discontinuities and nonzero start time
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libswscale/input.c')
0 files changed, 0 insertions, 0 deletions