Merge commit '39e16ee2289e4240a82597b97db5541bbbd2b996'

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 4a46bfcf464a86384aed9ddcb4903aec03f15698..19183115adfc514ae3c48acd43256d93c61ab979 100644 (file)
--- 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:
 ------------------------------------------