Merge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'
authorClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:54:44 +0000 (15:54 +0100)
committerClément Bœsch <u@pkh.me>
Sun, 19 Mar 2017 14:54:44 +0000 (15:54 +0100)
commit842e7853c73d09f8e262d379b5bc1479098655d8
tree9c3cf18ee7b0ff7e98806016cd5dfb543c568ad9
parent92cd2c04b1c255a40cfb27732aad4bc78211cd93
parent42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e
Merge commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e'

* commit '42c4c2d2a6dc48adb0e901ef5617acfba0a3a18e':
  aac: Drop broken cruft

Merged-by: Clément Bœsch <u@pkh.me>
libavcodec/aacsbr_template.c