Michael Niedermayer 803445e02c Merge remote-tracking branch 'qatar/master' ...

* qatar/master:
  Drop pointless directory name prefixes from #includes in the current dir

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

2013-09-11 12:51:01 +02:00

..

bfin

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

2013-08-29 15:56:03 +02:00

ppc

ppc: don't return a value from a function declared void

2013-08-30 11:56:11 +02:00

sparc

Merge commit '716d413c13981da15323c7a3821860536eefdbbb'

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

x86

Reinstate proper FFmpeg license for all files.

2013-08-30 15:47:38 +00:00

colorspace-test.c

Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112'

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

input.c

swscale: remove unneeded include assert.h

2013-07-19 18:52:41 +02: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 dither enum

2013-08-15 21:39:32 +02:00

output.c

Merge commit 'aa2ba8c99e5708884a56aea9c1d96e014866f8a3'

2013-08-16 12:56:48 +02:00

rgb2rgb_template.c

lavu: add FF_CEIL_RSHIFT and use it in various places.

2013-05-09 16:59:42 +02:00

rgb2rgb.c

Merge commit 'a519583991c38d38503ab08357716513facc5725'

2013-08-29 14:42:34 +02:00

rgb2rgb.h

Merge remote-tracking branch 'qatar/master'

2013-09-11 12:51:01 +02:00

swscale_internal.h

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

2013-08-29 15:56:03 +02:00

swscale_unscaled.c

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

2013-08-29 15:56:03 +02:00

swscale-test.c

Replace all occurrences of PRI in sscanf() calls with SCN

2013-04-10 09:56:48 +02:00

swscale.c

Merge commit '1909f6b1b6da2db371c179bed5a19aaf979b7557'

2013-08-29 15:56:03 +02:00

swscale.h

Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491'

2013-05-07 11:04:07 +02:00

utils.c

swscale/utils: use memcpy instead of loop in sws_cloneVec()

2013-09-08 16:39:38 +02:00

version.h

sws: add dither enum

2013-08-15 21:39:32 +02:00

yuv2rgb.c

Merge remote-tracking branch 'qatar/master'

2013-08-29 16:15:54 +02:00