Merge commit '5cc0057f4910c8c72421b812c8f337ef6c43696c'
authorClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:12:05 +0000 (11:12 +0100)
committerClément Bœsch <u@pkh.me>
Thu, 23 Mar 2017 10:14:13 +0000 (11:14 +0100)
commitd521258b19a54f4ada61d24b9adb15d5993eda1c
treee8baddc71dbd529b9759d29a12391b9812db9ff0
parent7e4ba776a2240d40124d5540ea6b2118fa2fe26a
parent5cc0057f4910c8c72421b812c8f337ef6c43696c
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>
doc/libav-merge.txt