aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorClément Bœsch <u@pkh.me>2017-03-23 11:12:05 +0100
committerClément Bœsch <u@pkh.me>2017-03-23 11:14:13 +0100
commitd521258b19a54f4ada61d24b9adb15d5993eda1c (patch)
treee8baddc71dbd529b9759d29a12391b9812db9ff0
parent7e4ba776a2240d40124d5540ea6b2118fa2fe26a (diff)
parent5cc0057f4910c8c72421b812c8f337ef6c43696c (diff)
downloadffmpeg-d521258b19a54f4ada61d24b9adb15d5993eda1c.tar.gz
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 <u@pkh.me>
-rw-r--r--doc/libav-merge.txt1
1 files changed, 1 insertions, 0 deletions
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:
------------------------------------------