Skip to content

F
ffmpeg
Commit 53e116ee authored by Hendrik Leppkes's avatar Hendrik Leppkes
Browse files
Options

doc: update merge status for recent additions and skipped merges

parent 93cd6dd4
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
doc/libav-merge.txt
View file @ 53e116ee
......@@ -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:
------------------------------------------
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment