Michael Niedermayer 1b03e09198 Merge commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b' ...

* commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b':
  x86inc: Rename "program_name" to "private_prefix"
  configure: Run SHFLAGS through ldflags_filter()

Conflicts:
	configure

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

2013-01-19 13:01:06 +01: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 commit 'ef5d41a5534b65f03d02f2e11a503ab8416bfc3b'

2013-01-19 13:01:06 +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

sws: add AVOption flag for error diffusion dither

2013-01-19 02:38:48 +01:00

output.c

sws: fix ED mono dither black level

2013-01-19 04:21:44 +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

sws: Support error diffusion dither for mono output

2013-01-18 23:26:00 +01:00

swscale_unscaled.c

sws: Support error diffusion dither for mono output

2013-01-18 23:26:00 +01:00

swscale-test.c

libswscale/swscale-test: fix some const correctness

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

swscale.c

sws: Only reset dither state for bitexact mode

2013-01-19 02:38:48 +01:00

swscale.h

sws: Support error diffusion dither for mono output

2013-01-18 23:26:00 +01:00

utils.c

sws: Enable full chroma resolution when needed for ED dither

2013-01-19 02:38:48 +01:00

version.h

lsws: define version in SWScaler class

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

yuv2rgb.c

yuv2rgb: fix integer overflow in fill_gv_table()

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