summaryrefslogtreecommitdiff
path: root/doc/libav-merge.txt
diff options
context:
space:
mode:
authorHendrik Leppkes <h.leppkes@gmail.com>2016-10-01 15:20:44 +0200
committerHendrik Leppkes <h.leppkes@gmail.com>2016-10-01 15:20:44 +0200
commit3c18188f9f3e5d7980c7998416a39f7efba307bf (patch)
tree9623a7d04bf3224238e6ddb951cd1b89bf90f9da /doc/libav-merge.txt
parent62c58c59d54fda034ed7f7c16e3faa1bdaa1e16d (diff)
downloadffmpeg-3c18188f9f3e5d7980c7998416a39f7efba307bf.tar.gz
doc/libav-merge: add a note for the skipped QSV functionality
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r--doc/libav-merge.txt1
1 files changed, 1 insertions, 0 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 26eb87c2de..962a98b1f8 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:
------------------------------------------