Merge commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417'

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 23b48d1e2bb1ee62e7c2691936e6f511a4551df5..50eb34fd7c7061dbcedf4d4b1b3d808a776128b9 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -94,8 +94,6 @@ Stuff that didn't reach the codebase:
   - a853388d2 hevc: change the stride of the MC buffer to be in bytes instead of elements
   - 0cef06df0 checkasm: add HEVC MC tests
   - e7078e842 hevcdsp: add x86 SIMD for MC
-- QSV scaling filter (62c58c5)
-- ffmpeg.c filter init decoupling (3e265ca,a3a0230,d2e56cf,94ebf55)
 
 Collateral damage that needs work locally:
 ------------------------------------------