Merge commit '4993a68f0f9285f92a42a54305dc0244665b7db4'
authorJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:24:14 +0000 (20:24 -0300)
committerJames Almer <jamrial@gmail.com>
Wed, 1 Nov 2017 23:24:14 +0000 (20:24 -0300)
commit862c85b2ff0db551222950ecfa7693e8e3bb18ef
treea0bec0f6bd0edcb831988c2d59b8c8fb6a5f3f40
parentf3f1bbc6a88bcbc02acc97907d0d932f32ec4574
parent4993a68f0f9285f92a42a54305dc0244665b7db4
Merge commit '4993a68f0f9285f92a42a54305dc0244665b7db4'

* commit '4993a68f0f9285f92a42a54305dc0244665b7db4':
  hwcontext: Mark local table static const
  libfdk-aacdec: Correct buffer_size parameter

This commit is a noop, see
ca6776a993903dbcfef5ae8a18556c40ecf83e1c
0b1794a43e1083644aa3db2a09323681cfe080ec

Merged-by: James Almer <jamrial@gmail.com>