diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 21:55:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-11-17 21:55:23 +0100 |
| commit | 9e0b0c60bd7fa4d4a476b93f94436a8e37d98983 (patch) | |
| tree | e0e8de2fab123d2e0c39f45ba42351442d1cc049 /tests/ffserver-regression.sh | |
| parent | 1fddfaa282ff63dba4170ced30f96dbb48bd0246 (diff) | |
| parent | 2ded57371abead879bcee56da5131e5fac0d17ef (diff) | |
| download | ffmpeg-9e0b0c60bd7fa4d4a476b93f94436a8e37d98983.tar.gz | |
Merge commit '2ded57371abead879bcee56da5131e5fac0d17ef'
* commit '2ded57371abead879bcee56da5131e5fac0d17ef':
movenc: Add support for writing sidx atoms for DASH segments
Conflicts:
Changelog
libavformat/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'tests/ffserver-regression.sh')
0 files changed, 0 insertions, 0 deletions