[FFmpeg-cvslog] Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sun Jan  5 01:48:29 2014 +0100| [4195ae0fd81534b4e68b9b3533f9da9b0a19a5fe] | committer: Michael Niedermayer

Merge commit 'b2212dec0f011893ec68eecaa990170fa24050d7'

* commit 'b2212dec0f011893ec68eecaa990170fa24050d7':
  aac: Fix TNS decoding for the 512 sample window family.

also temporarily disable fate-aac-er_ad6000np_44_ep0 as this commit
causes a mismatch with the reference pcm file
The test will be reenabled after all fixes and with a new pcm reference

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

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