third_party_ffmpeg/libswscale
Michael Niedermayer 45a73d2b47 Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a'
* commit 'c011ceef78eae66039efc66d9551a7146e08838a':
  swscale: ppc: Remove commented-out define cruft
  nsvdec: Remove commented-out debug cruft
  cpu: Restructure code to avoid pointless ret variable indirection

Conflicts:
	libavutil/cpu.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
2013-06-03 11:53:05 +02:00
..
bfin Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
ppc Merge commit 'c011ceef78eae66039efc66d9551a7146e08838a' 2013-06-03 11:53:05 +02:00
sparc Merge commit '716d413c13981da15323c7a3821860536eefdbbb' 2012-10-08 21:06:57 +02:00
x86 lavu: add FF_CEIL_RSHIFT and use it in various places. 2013-05-09 16:59:42 +02:00
colorspace-test.c Merge commit 'd488c3bcbaf7ddda42597e014deb661a7e9e2112' 2012-08-29 18:04:34 +02:00
input.c libswscale: GBRAP input & output and GBRAP16 input support 2013-05-08 12:48:05 +00: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 swscale/output: silence warning about undefined 'ASSERT_LEVEL' 2013-05-19 14:06:16 +00: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 sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables 2013-04-15 03:08:37 +02:00
rgb2rgb.h sws: Update rgb24toyv12_c() to user supplied rgb2yuv tables 2013-04-15 03:08:37 +02:00
swscale_internal.h replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +02:00
swscale_unscaled.c Merge remote-tracking branch 'qatar/master' 2013-05-15 11:10:09 +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 replace remaining PIX_FMT_* flags with AV_PIX_FMT_FLAG_* 2013-05-15 11:23:14 +02:00
swscale.h Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491' 2013-05-07 11:04:07 +02:00
utils.c add YUVJ411P 2013-05-21 12:56:11 +02:00
version.h Merge commit 'c1eb3e7fecdc270e03a700d61ef941600a6af491' 2013-05-07 11:04:07 +02:00
yuv2rgb.c swscale: RGBA64 output 2013-05-12 21:47:19 +02:00