Merge commit '208f3abb917757743313da0da714e525e03159d2'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:46:29 +0000 (13:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 24 Nov 2014 12:48:31 +0000 (13:48 +0100)
commit96398cc12332bd0bd8acf921bfa310ed12146efd
treee7bc6a504b34942d32d33620dc5f4712298a29fd
parentf41d409b7a6cc0295d45c4ac879f8df7d0cc9a76
parent208f3abb917757743313da0da714e525e03159d2
Merge commit '208f3abb917757743313da0da714e525e03159d2'

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

See: c6d3b3be1555257ff3f88da6b8dca2158dad2a85
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/aacsbr.c