avcodec/opusenc_psy: use av_clip_uintp2()

[ffmpeg] / doc / libav-merge.txt

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 690c4ef97f222b0a538ab0d564add2eb1d4c6f76..96b008b71b2081d0737ee4b06e62cd6bd0df05ee 100644 (file)
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -105,7 +105,6 @@ 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
-- hlsenc encryption support may need some adjustment (see edc43c571d)
 
 Extra changes needed to be aligned with Libav:
 ----------------------------------------------