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)
commit421c116fc498c2564823b96182c5baddcc0629b6
tree397e7fec16d6d1a53ec2e3de67017678ab02d4c1
parent849d40dce62d125eb470cb549f98f32b71bb9730
parentcf79f202757b0444f448fe472595ac140d7a3e77
Merge remote-tracking branch 'cehoyos/master'

* 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>