summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--doc/libav-merge.txt3
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 962a98b1f8..f5a5b2944e 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -88,7 +88,8 @@ 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 HWContext integration (04b17ff and 130e1f1), QSV scaling filter (62c58c5)
+- QSV scaling filter (62c58c5)
+- ffmpeg.c filter init decoupling (3e265ca & a3a0230)
Collateral damage that needs work locally:
------------------------------------------