[FFmpeg-cvslog] doc/libav-merge: remove line about libavutil atomics API

[James Almer]

ffmpeg | branch: master | James Almer <jamrial at gmail.com> | Fri Jan  5 22:09:39 2018 -0300| [077fe9eb0679ccba53b1814ac5e687ea3eb2a3c1] | committer: James Almer

doc/libav-merge: remove line about libavutil atomics API

See 89b84cb18b54d3af281643bcad8bba365a702e96.

Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=077fe9eb0679ccba53b1814ac5e687ea3eb2a3c1
---

 doc/libav-merge.txt | 1 -
 1 file changed, 1 deletion(-)

diff --git a/doc/libav-merge.txt b/doc/libav-merge.txt
index 2477d90e7b..4ba08fc588 100644
--- a/doc/libav-merge.txt
+++ b/doc/libav-merge.txt
@@ -95,7 +95,6 @@ Stuff that didn't reach the codebase:
   - 0cef06df0 checkasm: add HEVC MC tests
   - e7078e842 hevcdsp: add x86 SIMD for MC
   - 7993ec19a hevc: Add hevc_get_pixel_4/8/12/16/24/32/48/64
-- Removal of the custom atomic API (5cc0057f49, see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html)
 - new bitstream reader (see http://ffmpeg.org/pipermail/ffmpeg-devel/2017-April/209609.html)
 - use av_cpu_max_align() instead of hardcoding alignment requirements (see https://ffmpeg.org/pipermail/ffmpeg-devel/2017-September/215834.html)
   - f44ec22e0 lavc: use av_cpu_max_align() instead of hardcoding alignment requirements