Michael Niedermayer 0cfbfaaa12 Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241' ...

* commit '7b89cd20d844cbe763ca34e63e99d110043cf241':
  eamad: allocate a dummy reference frame when the real one is missing
  Replace remaining includes of audioconvert.h with channel_layout.h
  Replace some forgotten instances of PIX_FMT_* with AV_PIX_FMT_*.

Conflicts:
	libavcodec/h264.c

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

2013-03-12 15:44:15 +01:00

..

bfin

…

ppc

Merge commit '511cf612ac979f536fd65e14603a87ca5ad435f3'

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

sparc

…

x86

sws/x86: improve rounding for yuv2yuvX

2013-02-15 23:33:04 +01:00

colorspace-test.c

…

input.c

sws: add planar RGB formats to isAnyRGB

2013-01-26 20:40:44 +01:00

libswscale.v

…

Makefile

…

options.c

sws: add AVOption flag for error diffusion dither

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

output.c

Merge commit 'd6d5ef5534d582f9dbaf18ac2605cf5bb72cd821'

2013-02-10 13:49:53 +01:00

rgb2rgb_template.c

…

rgb2rgb.c

…

rgb2rgb.h

…

swscale_internal.h

Merge commit '05b0998f511ffa699407465d48c7d5805f746ad2'

2013-01-28 14:11:31 +01:00

swscale_unscaled.c

Merge commit '7b89cd20d844cbe763ca34e63e99d110043cf241'

2013-03-12 15:44:15 +01:00

swscale-test.c

swscale-test: fix 3 pointer type warnings

2013-02-26 16:50:32 +01:00

swscale.c

sws: Fix "warning: comparison of distinct pointer types lacks a cast"

2013-02-04 14:34:13 +01:00

swscale.h

sws: Fix error diffusion flag

2013-01-19 23:13:40 +01:00

utils.c

swscale: Disallow conversion to GBRP16

2013-02-11 20:03:16 +02:00

version.h

sws: Fix error diffusion flag

2013-01-19 23:13:40 +01:00

yuv2rgb.c

Merge remote-tracking branch 'qatar/master'

2013-02-10 14:17:06 +01:00