[FFmpeg-cvslog] Merge commit '074a00d192c0e749d677b008b337da42597e780f'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Jan  8 12:56:41 2013 +0100| [249fca3df9f9790369d38aaa63c828c3e2a30936] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=249fca3df9f9790369d38aaa63c828c3e2a30936
---