Merge commit 'b55566db4c51d920a6496455bb30a608e5a50a41'

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index f5a5b2944e6b79a28943fb2f8d31d54b4bed3544..a0dea5421330cffd5bfe8d758c6fe8140b253f64 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -89,7 +89,7 @@ Stuff that didn't reach the codebase:
 
 - HEVC DSP and x86 MC SIMD improvements from Libav (see https://ffmpeg.org/pipermail/ffmpeg-devel/2015-December/184777.html)
 - QSV scaling filter (62c58c5)
-- ffmpeg.c filter init decoupling (3e265ca & a3a0230)
+- ffmpeg.c filter init decoupling (3e265ca,a3a0230,d2e56cf,94ebf55)
 
 Collateral damage that needs work locally:
 ------------------------------------------