Merge commit '074a00d192c0e749d677b008b337da42597e780f'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jan 2013 11:56:41 +0000 (12:56 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 8 Jan 2013 11:56:41 +0000 (12:56 +0100)
commit249fca3df9f9790369d38aaa63c828c3e2a30936
treefe8f3784cc3160505617bf76b32534c4b5367658
parent3a0bac27b3c851924a5fbde5301a3ad6bf951aba
parent074a00d192c0e749d677b008b337da42597e780f
Merge commit '074a00d192c0e749d677b008b337da42597e780f'

* commit '074a00d192c0e749d677b008b337da42597e780f':
  lavr: add a public function for setting a custom channel map
  lavr: typedef internal structs in internal.h
  doc: Extend commit message section

Conflicts:
doc/APIchanges
doc/developer.texi

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/APIchanges
doc/developer.texi
libavresample/utils.c