[FFmpeg-cvslog] doc: update merge status for recent additions and skipped merges

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sun Nov 13 17:29:01 2016 +0100| [53e116eeeb1bdd579c1aa43b14b49dc6cb7b6d6e] | committer: Hendrik Leppkes

doc: update merge status for recent additions and skipped merges

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=53e116eeeb1bdd579c1aa43b14b49dc6cb7b6d6e
---

 doc/libav-merge.txt | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 962a98b..f5a5b29 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:
 ------------------------------------------