summaryrefslogtreecommitdiffstats
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-11 17:17:30 -0300
committerJames Almer <jamrial@gmail.com>2017-11-11 17:17:30 -0300
commitac36d0c97a9d33c08c2378998e278947ad2adf7f (patch)
tree45583596ed0556a05d4e8095b73659a9295f1d74 /doc/libav-merge.txt
parent24204eae1c7dba402d88f0cd3077814dbb7f9376 (diff)
downloadffmpeg-streaming-ac36d0c97a9d33c08c2378998e278947ad2adf7f.zip
ffmpeg-streaming-ac36d0c97a9d33c08c2378998e278947ad2adf7f.tar.gz
doc/libav-merge: mention more skipped outdev removal commits
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r--doc/libav-merge.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 916e4be..37839a9 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -102,7 +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 and https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/216904.html)
+- 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:
------------------------------------------
OpenPOWER on IntegriCloud