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)
* commit '7f29644108c5fbd80f160930b31b78b8704c1a49':
  aac: Fix low delay windowing.

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

Simple merge
Simple merge
Simple merge