Merge commit '75d642a944d5579e4ef20ff3701422a64692afcf'

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 50eb34fd7c7061dbcedf4d4b1b3d808a776128b9..7a82b7ba417ca78cc7f4ee6b71cd85b8cfce01b1 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -94,6 +94,7 @@ 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
+- VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348)
 
 Collateral damage that needs work locally:
 ------------------------------------------