diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 01:02:02 +0300 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-18 01:02:02 +0300 |
| commit | 4dc305d784ea01efd30871e9aa6625eff66e9e87 (patch) | |
| tree | d5e2bbc63303011c50463d11b8d40a331d6830a0 /tools | |
| parent | 3fa4351d6bea1b07a3dd71e2f61cef2af5130a7c (diff) | |
| parent | 40ed1cbf147d09fc0894bee160f0b6b6d9159fc5 (diff) | |
Merge commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5'
* commit '40ed1cbf147d09fc0894bee160f0b6b6d9159fc5':
movenc: Allow writing a DASH sidx atom at the start of files
Conflicts:
libavformat/movenc.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tools')
0 files changed, 0 insertions, 0 deletions