RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

doc: update merge status for recent additions and skipped merges

This commit is contained in:
Hendrik Leppkes 2016-11-13 17:29:01 +01:00
parent 93cd6dd488
commit 53e116eeeb
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/libav-merge.txt
View File

@ -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:
------------------------------------------