[FFmpeg-cvslog] doc/libav-merge: add a note for the skipped QSV functionality

[Hendrik Leppkes]

ffmpeg | branch: master | Hendrik Leppkes <h.leppkes at gmail.com> | Sat Oct  1 15:20:44 2016 +0200| [3c18188f9f3e5d7980c7998416a39f7efba307bf] | committer: Hendrik Leppkes

doc/libav-merge: add a note for the skipped QSV functionality

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

 doc/libav-merge.txt | 1 +
 1 file changed, 1 insertion(+)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 26eb87c..962a98b 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -88,6 +88,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 HWContext integration (04b17ff and 130e1f1), QSV scaling filter (62c58c5)
 
 Collateral damage that needs work locally:
 ------------------------------------------