X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=doc%2Flibav-merge.txt;h=8c182ae78d65c6a4cf8b50cc965e13db292d105a;hb=d25c945247979a88fac6bb3b7a26370262b96ef1;hp=4ba08fc588f9e4508b9292cc5874bc386fe5c25d;hpb=c00b218a8f75ed3eb87c213d95bd5775c0af5e12;p=ffmpeg diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 4ba08fc588f..8c182ae78d6 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -105,7 +105,6 @@ Stuff that didn't reach the codebase: Collateral damage that needs work locally: ------------------------------------------ -- Merge proresdec2.c and proresdec_lgpl.c - Merge proresenc_anatoliy.c and proresenc_kostya.c - Fix MIPS AC3 downmix