[FFmpeg-cvslog] Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jun  9 17:21:45 2015 +0200| [5f48a73bb099ed5302d332d8611bffd3bb3018ce] | committer: Michael Niedermayer

Merge commit 'fb1473080223a634b8ac2cca48a632d037a0a69d'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=5f48a73bb099ed5302d332d8611bffd3bb3018ce
---