Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:32:52 +0000 (17:32 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 21 Dec 2012 16:32:52 +0000 (17:32 +0100)
commitd27edc038a5d59f25b28964b38d9f8d7ce4a6e64
treeb43acbce10229c375ac3b21c80a6c2c09354da8d
parenta41bf09d9c56215448f14fb086c9f882eb41ecac
parent511cf612ac979f536fd65e14603a87ca5ad435f3
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@gmx.at>
32 files changed:
configure
doc/Doxyfile
doc/developer.texi
libavcodec/4xm.c
libavcodec/aacpsy.c
libavcodec/ac3dec.c
libavcodec/ac3enc.c
libavcodec/acelp_filters.h
libavcodec/bitstream.c
libavcodec/ffv1dec.c
libavcodec/flicvideo.c
libavcodec/h264_direct.c
libavcodec/indeo3data.h
libavcodec/lagarith.c
libavcodec/libfdk-aacenc.c
libavcodec/libtheoraenc.c
libavcodec/parser.c
libavcodec/pngenc.c
libavcodec/ratecontrol.c
libavcodec/resample.c
libavcodec/rv10.c
libavcodec/shorten.c
libavcodec/vorbisdec.c
libavcodec/wmaprodec.c
libavformat/dvenc.c
libavformat/rtpdec_jpeg.c
libavformat/smoothstreamingenc.c
libavformat/spdifenc.c
libswscale/ppc/yuv2yuv_altivec.c
libswscale/swscale.c
tests/audiogen.c
tools/patcheck