[FFmpeg-cvslog] Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  5 02:18:51 2014 +0100| [fd53f9d985c90be417d2acd5bc7f4300054d9dcd] | committer: Michael Niedermayer

Merge commit '7f29644108c5fbd80f160930b31b78b8704c1a49'

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

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=fd53f9d985c90be417d2acd5bc7f4300054d9dcd
---