doc: update merge status for recent additions and skipped merges
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:29:01 +0000 (17:29 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 13 Nov 2016 16:29:01 +0000 (17:29 +0100)
doc/libav-merge.txt

index 962a98b..f5a5b29 100644 (file)
@@ -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:
 ------------------------------------------