Commit 7c9b469a authored by James Almer's avatar James Almer

Merge commit '16cb06bb'

* commit '16cb06bb':
  hlsenc: Support recovery from an already present playlist

This commit is a noop. It needs extra work to apply cleanly.
Merged-by: 's avatarJames Almer <jamrial@gmail.com>
parents e70cdf91 16cb06bb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment