Merge commit '4b169321b84502302f2badb056ebee4fdaea94fa'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 10:45:19 +0000 (12:45 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 28 Jul 2014 10:46:49 +0000 (12:46 +0200)
* commit '4b169321b84502302f2badb056ebee4fdaea94fa':
  codec_desc: fix some typos in long codec names

See: 60b59d657e4d2c710391b8238533c2f3a51086f7
See: c3ca70204bd816bcef59c3d278b3d8607e2525ca
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge