Michael Niedermayer d27edc038a 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>

2012-12-21 17:32:52 +01:00

..

bfin

…

ppc

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

sparc

…

x86

Merge remote-tracking branch 'qatar/master'

2012-11-19 14:24:20 +01:00

colorspace-test.c

…

input.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

libswscale.v

…

Makefile

…

options.c

lsws: define version in SWScaler class

2012-11-29 10:20:21 +01:00

output.c

swscale: fix 12 and 14 bit YUV planar output with scaling.

2012-12-01 03:41:24 +01:00

rgb2rgb_template.c

…

rgb2rgb.c

…

rgb2rgb.h

…

swscale_internal.h

…

swscale_unscaled.c

…

swscale-test.c

…

swscale.c

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

2012-12-21 17:32:52 +01:00

swscale.h

doxy: add ref for lavfi, lpp and lsws.

2012-12-11 02:13:43 +01:00

utils.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +01:00

version.h

lsws: define version in SWScaler class

2012-11-29 10:20:21 +01:00

yuv2rgb.c

…