Merge commit 'ad71d3276fef0ee7e791e62bbfe9c4e540047417'

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index a0dea5421330cffd5bfe8d758c6fe8140b253f64..50eb34fd7c7061dbcedf4d4b1b3d808a776128b9 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -88,8 +88,12 @@ 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 scaling filter (62c58c5)
-- ffmpeg.c filter init decoupling (3e265ca,a3a0230,d2e56cf,94ebf55)
+  - 1f821750f hevcdsp: split the qpel functions by width instead of by the subpixel fraction
+  - 818bfe7f0 hevcdsp: split the epel functions by width
+  - 688417399 hevcdsp: split the pred functions by width
+  - 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
 
 Collateral damage that needs work locally:
 ------------------------------------------