[FFmpeg-cvslog] Merge commit '4b169321b84502302f2badb056ebee4fdaea94fa'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jul 28 12:45:19 2014 +0200| [c11255ae8b1a6239cfde38bb6d44dde35eee9648] | committer: Michael Niedermayer

Merge commit '4b169321b84502302f2badb056ebee4fdaea94fa'

* commit '4b169321b84502302f2badb056ebee4fdaea94fa':
  codec_desc: fix some typos in long codec names

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

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