[FFmpeg-cvslog] Merge commit '208f3abb917757743313da0da714e525e03159d2'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Nov 24 13:46:29 2014 +0100| [96398cc12332bd0bd8acf921bfa310ed12146efd] | committer: Michael Niedermayer

Merge commit '208f3abb917757743313da0da714e525e03159d2'

* commit '208f3abb917757743313da0da714e525e03159d2':
  aacsbr: always initialize max_qmf_subbands

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

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