diff options
author | Anton Khirnov <anton@khirnov.net> | 2016-03-26 12:39:58 +0100 |
---|---|---|
committer | Mark Thompson <sw@jkqxz.net> | 2017-03-12 15:02:33 +0000 |
commit | 807a3b30d29128773ca433dac530d440638bbbf3 (patch) | |
tree | 6ab0a5d93c49bb16e721544ff908ddfb16d51fbb /doc/libav-merge.txt | |
parent | 210dd7bbb2c0e4013fd8519d3b20e3032f0beb18 (diff) | |
download | ffmpeg-807a3b30d29128773ca433dac530d440638bbbf3.tar.gz |
lavfi: add a QSV scaling filter
This merges libav commit ac7bfd69678f3966e38debdb27f4bde94dc0345c,
which was previously skipped.
(cherry picked from commit ac7bfd69678f3966e38debdb27f4bde94dc0345c)
Signed-off-by: Mark Thompson <sw@jkqxz.net>
Diffstat (limited to 'doc/libav-merge.txt')
-rw-r--r-- | doc/libav-merge.txt | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 39d846f8fc..50eb34fd7c 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -94,7 +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) Collateral damage that needs work locally: ------------------------------------------ |