Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 15:21:45 +0000 (17:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 9 Jun 2015 15:22:35 +0000 (17:22 +0200)
commit5f48a73bb099ed5302d332d8611bffd3bb3018ce
treeb866133de32beb49aa927e6288ea0ff2a5821e25
parent4b082bc2419d70333c4240e6cfad1ce11f36ae2a
parentfb1473080223a634b8ac2cca48a632d037a0a69d
Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'

* commit 'fb1473080223a634b8ac2cca48a632d037a0a69d':
  aac_parser: add required padding for GetBitContext buffer

See: fccd85b9f30525f88692f53134eba41f1f2d90db
Merged-by: Michael Niedermayer <michaelni@gmx.at>