Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'
[ffmpeg.git] / doc / libav-merge.txt
index 9f3c9c2a9ed666a8ce74000d25be4d47f133d064..577206f6a21043d540f9cb4f0029c918220a8747 100644 (file)
@@ -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:
 ------------------------------------------