Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 01:18:51 +0000 (02:18 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 5 Jan 2014 01:18:57 +0000 (02:18 +0100)
commitfd53f9d985c90be417d2acd5bc7f4300054d9dcd
tree1093ec6f0e06c572a0fbd6cd619bce673baacc51
parentf200ec20b8156d0c81d4eef5f8a3e2d3094427c3
parent7f29644108c5fbd80f160930b31b78b8704c1a49
Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

* commit '7f29644108c5fbd80f160930b31b78b8704c1a49':
  aac: Fix low delay windowing.

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacdec.c
libavcodec/aactab.c
libavcodec/aactab.h