[FFmpeg-cvslog] doc/libav-merge: mention skipped hlsenc commit

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Wed Nov  1 13:55:29 2017 -0300| [4b97435566dc005c8ece7a29c53c47fdd439ae66] | committer: James Almer

doc/libav-merge: mention skipped hlsenc commit

Signed-off-by: James Almer <jamrial at gmail.com>

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

 doc/libav-merge.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4a46bfcf46..19183115ad 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -101,6 +101,7 @@ Stuff that didn't reach the codebase:
 - use av_cpu_max_align() instead of hardcoding alignment requirements (see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html)
   - f44ec22e0 lavc: use av_cpu_max_align() instead of hardcoding alignment requirements
   - 4de220d2e frame: allow align=0 (meaning automatic) for av_frame_get_buffer()
+- Support recovery from an already present HLS playlist (see 16cb06bb30)
 
 Collateral damage that needs work locally:
 ------------------------------------------