[FFmpeg-cvslog] Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Fri Dec 21 17:32:52 2012 +0100| [d27edc038a5d59f25b28964b38d9f8d7ce4a6e64] | committer: Michael Niedermayer

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

* commit '511cf612ac979f536fd65e14603a87ca5ad435f3':
  miscellaneous typo fixes

Conflicts:
	libavcodec/4xm.c
	libavcodec/lagarith.c
	libavcodec/parser.c
	libavcodec/ratecontrol.c
	libavcodec/shorten.c
	libavcodec/vda_h264.c
	libavformat/dvenc.c
	libavformat/wtv.c
	tools/patcheck

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

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