Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 4 May 2013 08:17:52 +0000 (10:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 4 May 2013 08:17:52 +0000 (10:17 +0200)
commit0104570fb65bef9986a630e0188b3756295693a9
treed0612ebe9b9cdf7fcf7da0c6ced55c0609887e05
parent711c8ee71d719d6d89a523618f078bb17dbe1abf
parenta5f8873620ce502d37d0cc3ef93ada2ea8fb8de7
Merge commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7'

* commit 'a5f8873620ce502d37d0cc3ef93ada2ea8fb8de7':
  silly typo fixes

Conflicts:
doc/protocols.texi
libavcodec/aacpsy.c
libavformat/utils.c
tools/patcheck

Merged-by: Michael Niedermayer <michaelni@gmx.at>
13 files changed:
libavcodec/aacpsy.c
libavcodec/flac_parser.c
libavcodec/flacenc.c
libavcodec/flicvideo.c
libavcodec/wmavoice.c
libavcodec/x86/fpel_mmx.c
libavdevice/v4l2.c
libavformat/avformat.h
libavformat/idcin.c
libavformat/pmpdec.c
libavformat/utils.c
libavformat/wavdec.c
tools/patcheck