* commit '523c7bd2':
  misc typo, style and wording fixes

Conflicts:
	libavcodec/options_table.h
	libavutil/pixfmt.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>