Michael Niedermayer 335bbe424f Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  lavc: Deprecate unused FF_ER_VERY_AGGRESSIVE
  x11grab: add show_region AVOption.
  x11grab: add follow_mouse AVOption.
  Do not convert RGB buffer at once when stride does not fit exact samples.

Conflicts:
	libswscale/swscale_unscaled.c

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

2011-08-01 00:35:57 +02:00

..

bfin

Merge remote-tracking branch 'qatar/master'

2011-06-22 05:16:40 +02:00

mlib

…

ppc

swscale: for >8bit scaling, read in native bit-depth.

2011-07-11 03:51:10 +02:00

sparc

…

x86

swscale: error dithering for 16/9/10-bit to 8-bit.

2011-07-11 03:51:46 +02:00

colorspace-test.c

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

libswscale.v

…

Makefile

Merge remote-tracking branch 'qatar/master'

2011-06-29 05:23:12 +02:00

options.c

Merge remote-tracking branch 'qatar/master'

2011-05-25 06:32:45 +02:00

rgb2rgb_template.c

Merge remote-tracking branch 'qatar/master'

2011-05-30 01:29:11 +02:00

rgb2rgb.c

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

rgb2rgb.h

Merge remote-tracking branch 'qatar/master' into master

2011-05-29 03:34:35 +02:00

swscale_internal.h

Merge commit '142e76f1055de5dde44696e71a5f63f2cb11dedf'

2011-07-11 04:23:25 +02:00

swscale_template.c

Merge remote-tracking branch 'qatar/master'

2011-06-04 06:35:17 +02:00

swscale_unscaled.c

Merge remote-tracking branch 'qatar/master'

2011-08-01 00:35:57 +02:00

swscale-test.c

swscale: Remove commented-out printf cruft.

2011-05-28 11:09:30 +02:00

swscale.c

Merge branch 'sws_32bit_integration'

2011-07-11 04:01:01 +02:00

swscale.h

Merge remote-tracking branch 'qatar/master'

2011-07-14 20:44:58 +02:00

utils.c

lsws: apply logging factorization in sws_scale_init()

2011-07-28 10:27:51 +02:00

yuv2rgb.c

swscale: remove sws_format_name()

2011-05-30 09:07:43 +02:00