Merge commit '4993a68f'

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

This commit is a noop, see
ca6776a9
0b1794a4Merged-by: NJames Almer <jamrial@gmail.com>