Merge commit '2689bb115ca64921789092148deaf213a0d94d2e'
authorClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:06:11 +0000 (13:06 +0200)
committerClément Bœsch <clement@stupeflix.com>
Tue, 21 Jun 2016 11:06:11 +0000 (13:06 +0200)
commit5ffbfe38a5d1cacac15187c5f8828c1dc18eb9f4
treec7935a49e278d54c782d394617f40808791fae05
parentb5f9f16582d9785ed6659d6bf8777cd004908cc2
parent2689bb115ca64921789092148deaf213a0d94d2e
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@stupeflix.com>