Michael Niedermayer 78ec407d5a Merge commit '652f5185945c8405fc57aed353286858df8d066f' ...

* commit '652f5185945c8405fc57aed353286858df8d066f':
  x86: mmx2 ---> mmxext in comments and messages

Conflicts:
	libswscale/x86/swscale_template.c

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

2012-10-31 14:02:35 +01:00

..

bfin

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

ppc

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

sparc

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

x86

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

colorspace-test.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

2012-08-29 18:04:34 +02:00

input.c

sws: fix handling of big endian alpha

2012-10-31 03:10:35 +01:00

libswscale.v

swscale: Do not make ff_ symbols globally visible.

2012-10-10 02:08:01 +02:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-07-04 21:03:28 +02:00

options.c

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

output.c

Merge commit '9953ff3cd844eb5f6d8dfce98cad94b78a0fc7dc'

2012-10-12 15:57:28 +02:00

rgb2rgb_template.c

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

rgb2rgb.c

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

rgb2rgb.h

swscale: unscaled rgba64->rgb48

2012-07-19 00:17:16 +00:00

swscale_internal.h

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

swscale_unscaled.c

sws: move fillPlane16() to header so it can be used from more than 1 place

2012-10-30 18:51:21 +01:00

swscale-test.c

sws-test: parse command line args before initing contexts

2012-10-17 11:56:36 +02:00

swscale.c

swscale.c:remove fill_plane9or10() use fillPlane16()

2012-10-30 18:51:21 +01:00

swscale.h

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

2012-10-08 21:06:57 +02:00

utils.c

Merge commit '652f5185945c8405fc57aed353286858df8d066f'

2012-10-31 14:02:35 +01:00

version.h

Merge remote-tracking branch 'qatar/master'

2012-08-04 23:51:43 +02:00

yuv2rgb.c

yuv2rgb: fix integer overflow in fill_gv_table()

2012-10-24 01:24:26 +02:00