[FFmpeg-cvslog] Merge commit '2689bb115ca64921789092148deaf213a0d94d2e'

[Clément Bœsch]

ffmpeg | branch: master | Clément Bœsch <clement at stupeflix.com> | Tue Jun 21 13:06:11 2016 +0200| [5ffbfe38a5d1cacac15187c5f8828c1dc18eb9f4] | committer: Clément Bœsch

Merge commit '2689bb115ca64921789092148deaf213a0d94d2e'

* commit '2689bb115ca64921789092148deaf213a0d94d2e':
  mmaldec: Fix avpriv_atomic_get usage

This commit is a noop, see da43e9e157a3c64337348b44193ab390bd481911

Merged-by: Clément Bœsch <clement at stupeflix.com>

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