FFmpeg/libswscale
Michael Niedermayer 5ff1b588eb Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19'
* commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19':
  swscale: ppc: Hide arch-specific initialization details

Conflicts:
	libswscale/utils.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-08-29 15:10:09 +02:00
..
bfin
ppc Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19' 2013-08-29 15:10:09 +02:00
sparc
x86 Merge commit 'a519583991c38d38503ab08357716513facc5725' 2013-08-29 14:42:34 +02:00
colorspace-test.c
input.c swscale: remove unneeded include assert.h 2013-07-19 18:52:41 +02:00
libswscale.v
Makefile
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
swscale_internal.h Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19' 2013-08-29 15:10:09 +02:00
swscale_unscaled.c Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19' 2013-08-29 15:10:09 +02:00
swscale-test.c
swscale.c Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19' 2013-08-29 15:10:09 +02:00
swscale.h Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491' 2013-05-07 11:04:07 +02:00
utils.c Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19' 2013-08-29 15:10:09 +02:00
version.h sws: add dither enum 2013-08-15 21:39:32 +02:00
yuv2rgb.c Merge commit 'c2503d9c8ab42ea55922e9f5a10c8bfbbbfeaf19' 2013-08-29 15:10:09 +02:00