diff options
| author | James Almer <jamrial@gmail.com> | 2018-03-15 17:55:36 -0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2018-03-15 17:55:36 -0300 |
| commit | 061337a073236cb0bc6c56036f50f883d2887681 (patch) | |
| tree | 1e885ea6493b5a263f138d5e3f203ea7df283571 /libavformat | |
| parent | 1dd7bb978436e9064e92411693252ad4ad183435 (diff) | |
| parent | aeaa108bafa11db290f1ada0e22dbfbd655cf2ba (diff) | |
| download | ffmpeg-061337a073236cb0bc6c56036f50f883d2887681.tar.gz | |
Merge commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba'
* commit 'aeaa108bafa11db290f1ada0e22dbfbd655cf2ba':
hls: Add a discontinuity marker on recover
This commit is a noop, see
572a8292cbded93c64110b872d2a8abadc92b741
6b95da9af91cd912561aa25593d6a41caa071963
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
0 files changed, 0 insertions, 0 deletions