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)
commitecaf5143282cc7a8335f5e19c750de66b1ee8389
tree1b3f22b8f0bd0363491f09b287749dbc38a69473
parentd9c9a0c76738446ad3d4e899f525766d53dd0ded
parent24efdea7fd024431f8ddd2b08c9390eba08c91f1
Merge remote-tracking branch 'qatar/master'

* 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>
libavcodec/aacenc.c