[FFmpeg-cvslog] Merge commit '16cb06bb30390c3d74312fc6aead818e19bfd8e4'

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 13:41:44 2017 -0300| [7c9b469a6b24c59a91dd147928fd599a108de232] | committer: James Almer

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 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7c9b469a6b24c59a91dd147928fd599a108de232
---