From e3d9bd7102beaeef8fe3520abe908e5bc0ec6df1 Mon Sep 17 00:00:00 2001 From: Hendrik Leppkes Date: Sun, 13 Nov 2016 22:34:01 +0100 Subject: doc/libav-merge: add skipped fixup commits to the list of missing changes --- doc/libav-merge.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'doc') 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: ------------------------------------------ -- cgit v1.2.3