doc: update merge status for recent additions and skipped merges

8 years ago · 53e116eeeb
parent 93cd6dd488
commit 53e116eeeb
1 changed files with 2 additions and 1 deletions
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@ -88,7 +88,8 @@ 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)
+- QSV scaling filter (62c58c5)
+- ffmpeg.c filter init decoupling (3e265ca & a3a0230)

 Collateral damage that needs work locally:
 ------------------------------------------