Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Aug 2011 17:49:04 +0000 (19:49 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 14 Aug 2011 17:49:11 +0000 (19:49 +0200)
* qatar/master:
  aacenc: Fix number of coefficients used in a LFE channel.
  aacenc: Fix a segfault with grouped psymodel.

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

Simple merge