Michael Niedermayer 93f80cf2cc Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1 ...

* commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb':
  lavc: Fix assignments in if() when calling ff_af_queue_add
  wav: Always seek to an even offset
  swscale: Use alpha from the right row in yuva2rgba_c
  Prepare for 9.6 Release

Conflicts:
	RELEASE

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

2013-05-12 14:31:59 +02:00

..

bfin

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

ppc

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

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

sparc

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

x86

Merge remote-tracking branch 'qatar/master'

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

colorspace-test.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

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

input.c

Merge commit 'fa8fcab1e0d31074c0644c4ac5194474c6c26415'

2012-11-01 13:11:51 +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

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

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 'a65bdceb060628881578afb29df4eb222421381f'

2012-10-31 14:08:49 +01:00

swscale_unscaled.c

sws: dont write out of array on bigendian

2013-02-14 14:17:21 +01:00

swscale-test.c

libswscale/swscale-test: fix some const correctness

2012-12-26 03:14:59 +01:00

swscale.c

sws: fix warning: cast from pointer to integer of different size

2012-12-29 20:50:43 +01:00

swscale.h

doxy: add ref for lavfi, lpp and lsws.

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

utils.c

Merge remote-tracking branch 'qatar/master'

2013-01-05 13:37:30 +01:00

version.h

lsws: define version in SWScaler class

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

yuv2rgb.c

Merge commit '1ab4578c88dc3e1407da15471bd323ba40c3ebbb' into release/1.1

2013-05-12 14:31:59 +02:00