summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-01 13:55:29 -0300
committerJames Almer <jamrial@gmail.com>2017-11-01 13:55:29 -0300
commit4b97435566dc005c8ece7a29c53c47fdd439ae66 (patch)
tree5f27fb7b77252b1a505b0b6d136a6fbf22e3f076 /doc/libav-merge.txt
parent9c2f4771510648cda601c4680cb91092eaae3f9a (diff)
downloadffmpeg-4b97435566dc005c8ece7a29c53c47fdd439ae66.tar.gz
doc/libav-merge: mention skipped hlsenc commit
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r--doc/libav-merge.txt1
1 files changed, 1 insertions, 0 deletions
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:
------------------------------------------