Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 13:28:58 +0000 (14:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 19 Dec 2012 13:28:58 +0000 (14:28 +0100)
commitaf804dbe9ed0e6a1b2d5e9eca1a7155c2fe91e3e
treef093e566a4985317a2dc7d9f3f5df38599142720
parent80a9297b711b7acb152ebbf84b28772945f920ea
parent523c7bd23c781aa0f3a85044896f5e18e8b52534
Merge commit '523c7bd23c781aa0f3a85044896f5e18e8b52534'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/arm/fmtconvert_vfp.S
libavcodec/options_table.h
libavcodec/sh4/dsputil_align.c
libavformat/avio_internal.h
libavformat/bethsoftvid.c
libavformat/nsvdec.c
libavutil/log.h
libavutil/pixfmt.h