Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 22:33:51 +0000 (00:33 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Apr 2014 22:33:57 +0000 (00:33 +0200)
* cehoyos/master:
  Fix a typo in amr.c.
  Remove an unneeded include of avassert.h from amr.c.
  Do not allow writing invalid wav channel layouts by default.

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

Trivial merge