Merge commit '16cb06bb30390c3d74312fc6aead818e19bfd8e4'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 16:41:44 +0000 (13:41 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 16:42:35 +0000 (13:42 -0300)
* 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>

Trivial merge