diff options
author | James Almer <jamrial@gmail.com> | 2017-11-01 13:41:44 -0300 |
---|---|---|
committer | James Almer <jamrial@gmail.com> | 2017-11-01 13:42:35 -0300 |
commit | 7c9b469a6b24c59a91dd147928fd599a108de232 (patch) | |
tree | e796e7f29b775d5ece0938df7e5771c958d4159d /libavutil/atomic_win32.h | |
parent | e70cdf91a7bc997f2b6e917f2ee4bfdc25d31684 (diff) | |
parent | 16cb06bb30390c3d74312fc6aead818e19bfd8e4 (diff) | |
download | ffmpeg-7c9b469a6b24c59a91dd147928fd599a108de232.tar.gz |
Merge commit '16cb06bb30390c3d74312fc6aead818e19bfd8e4'
* commit '16cb06bb30390c3d74312fc6aead818e19bfd8e4':
hlsenc: Support recovery from an already present playlist
This commit is a noop. It needs extra work to apply cleanly.
Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavutil/atomic_win32.h')
0 files changed, 0 insertions, 0 deletions