]> git.sesse.net Git - ffmpeg/commitdiff
projects / ffmpeg / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 74b8fa1 d6dc5d1)
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)
* commit 'd6dc5d15af0d8617611281a34a2c3f9ced149ccf':
  aacdec: fix aac_static_table_init() prototype

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

Trivial merge
Unnamed repository; edit this file 'description' to name the repository.