[FFmpeg-cvslog] Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Dec 19 14:28:58 2012 +0100| [af804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e] | committer: Michael Niedermayer

Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

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

Conflicts:
	libavcodec/options_table.h
	libavutil/pixfmt.h

Merged-by: Michael Niedermayer <michaelni at gmx.at>

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