diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt index 9f3c9c2a9e..577206f6a2 100644 --- a/doc/libav-merge.txt +++ b/doc/libav-merge.txt @@ -95,6 +95,7 @@ Stuff that didn't reach the codebase: - 0cef06df0 checkasm: add HEVC MC tests - e7078e842 hevcdsp: add x86 SIMD for MC - VAAPI VP8 decode hwaccel (currently under review: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-February/thread.html#207348) +- Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html) Collateral damage that needs work locally: ------------------------------------------