diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 17:29:01 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 17:29:01 +0100 |
| commit | 53e116eeeb1bdd579c1aa43b14b49dc6cb7b6d6e (patch) | |
| tree | b72637831468ac4078cc6b8386ebfa915394b50c | |
| parent | 93cd6dd488593116359c78395deef8414dfca799 (diff) | |
| download | ffmpeg-53e116eeeb1bdd579c1aa43b14b49dc6cb7b6d6e.tar.gz | |
doc: update merge status for recent additions and skipped merges
| -rw-r--r-- | doc/libav-merge.txt | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 962a98b1f8..f5a5b2944e 100644 --- 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: ------------------------------------------ |