Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

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

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

diff --cc libavcodec/aacdec.c
Simple merge

diff --cc libavcodec/aactab.c
Simple merge

diff --cc libavcodec/aactab.h
Simple merge