From: Clément Bœsch Date: Thu, 23 Mar 2017 10:12:05 +0000 (+0100) Subject: Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c' X-Git-Tag: n3.3~431 X-Git-Url: https://git.videolan.org/?p=ffmpeg.git;a=commitdiff_plain;h=d521258b19a54f4ada61d24b9adb15d5993eda1c;hp=7e4ba776a2240d40124d5540ea6b2118fa2fe26a Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c' * commit '5cc0057f4910c8c72421b812c8f337ef6c43696c': lavu: remove the custom atomic API This commit is a noop. The removal is postponed until all usages in FFmpeg are dropped as well. A patchset is on discussion on the mailing-list: http://ffmpeg.org/pipermail/ffmpeg-devel/2017-March/209003.html Merged-by: Clément Bœsch --- 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: ------------------------------------------