Merge commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846'

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 19183115adfc514ae3c48acd43256d93c61ab979..37839a97a7c21b2bf9d3bca38d176040f1631ab1 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -102,6 +102,7 @@ Stuff that didn't reach the codebase:
   - 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)
+- Remove all output devices (see 8e7e042d41, 8d3db95f20, 6ce13070bd, d46cd24986 and https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/216904.html)
 
 Collateral damage that needs work locally:
 ------------------------------------------