diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 22:34:01 +0100 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-11-13 22:34:01 +0100 |
| commit | e3d9bd7102beaeef8fe3520abe908e5bc0ec6df1 (patch) | |
| tree | 55aa5b34679a93f1b083aee8dd0a460ec462141d /doc/libav-merge.txt | |
| parent | cd47bd835a1fe942c2935a8b5ba12b7132347f1c (diff) | |
| download | ffmpeg-e3d9bd7102beaeef8fe3520abe908e5bc0ec6df1.tar.gz | |
doc/libav-merge: add skipped fixup commits to the list of missing changes
Diffstat (limited to 'doc/libav-merge.txt')
| -rw-r--r-- | doc/libav-merge.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index f5a5b2944e..a0dea54213 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -89,7 +89,7 @@ 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 scaling filter (62c58c5) -- ffmpeg.c filter init decoupling (3e265ca & a3a0230) +- ffmpeg.c filter init decoupling (3e265ca,a3a0230,d2e56cf,94ebf55) Collateral damage that needs work locally: ------------------------------------------ |