Merge commit '2beba58e0e4bda688bf96e12413231607ceafdd4'
authorJames Almer <jamrial@gmail.com>
Thu, 28 Dec 2017 00:05:11 +0000 (21:05 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 28 Dec 2017 00:05:11 +0000 (21:05 -0300)
commitaa6f43c2e959a960792f76d006b8699d733f258f
tree9c0c88a6cea8feaadea501b289a40a92dbb983f9
parentfa2d28567e3514323c440c4b7935a3d711eded8d
parent2beba58e0e4bda688bf96e12413231607ceafdd4
Merge commit '2beba58e0e4bda688bf96e12413231607ceafdd4'

* commit '2beba58e0e4bda688bf96e12413231607ceafdd4':
  mmaldec: Fix compilation after 2fcb0090

This commit is a noop, see 758fbc54fef2f31957b5c5f22e05e5fd9b04f631

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