Merge commit 'd6dc5d15af0d8617611281a34a2c3f9ced149ccf'
authorHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 13:53:37 +0000 (14:53 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Thu, 17 Dec 2015 13:53:37 +0000 (14:53 +0100)
commit49507f1d1731585ce10c4a797c6c55e72c694ecb
tree0703a77c503bbccd8d46cde5780009e8badaa2fb
parent74b8fa103d6345c0859434447b0a66aaf5608bd0
parentd6dc5d15af0d8617611281a34a2c3f9ced149ccf
Merge commit 'd6dc5d15af0d8617611281a34a2c3f9ced149ccf'

* commit 'd6dc5d15af0d8617611281a34a2c3f9ced149ccf':
  aacdec: fix aac_static_table_init() prototype

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>