Michael Niedermayer 59eb12faff Merge remote branch 'qatar/master' ... * qatar/master: (30 commits) AVOptions: make default_val a union, as proposed in AVOption2. arm/h264pred: add missing argument type. h264dsp_mmx: place bracket outside #if/#endif block. lavf/utils: fix ff_interleave_compare_dts corner case. fate: add 10-bit H264 tests. h264: do not print "too many references" warning for intra-only. Enable decoding of high bit depth h264. Adds 8-, 9- and 10-bit versions of some of the functions used by the h264 decoder. Add support for higher QP values in h264. Add the notion of pixel size in h264 related functions. Make the h264 loop filter bit depth aware. Template dsputil_template.c with respect to pixel size, etc. Template h264idct_template.c with respect to pixel size, etc. Preparatory patch for high bit depth h264 decoding support. Move some functions in dsputil.c into a new file dsputil_template.c. Move the functions in h264idct into a new file h264idct_template.c. Move the functions in h264pred.c into a new file h264pred_template.c. Preparatory patch for high bit depth h264 decoding support. Add pixel formats for 9- and 10-bit yuv420p. Choose h264 chroma dc dequant function dynamically. ... Conflicts: doc/APIchanges ffmpeg.c ffplay.c libavcodec/alpha/dsputil_alpha.c libavcodec/arm/dsputil_init_arm.c libavcodec/arm/dsputil_init_armv6.c libavcodec/arm/dsputil_init_neon.c libavcodec/arm/dsputil_iwmmxt.c libavcodec/arm/h264pred_init_arm.c libavcodec/bfin/dsputil_bfin.c libavcodec/dsputil.c libavcodec/h264.c libavcodec/h264.h libavcodec/h264_cabac.c libavcodec/h264_cavlc.c libavcodec/h264_loopfilter.c libavcodec/h264_ps.c libavcodec/h264_refs.c libavcodec/h264dsp.c libavcodec/h264idct.c libavcodec/h264pred.c libavcodec/mlib/dsputil_mlib.c libavcodec/options.c libavcodec/ppc/dsputil_altivec.c libavcodec/ppc/dsputil_ppc.c libavcodec/ppc/h264_altivec.c libavcodec/ps2/dsputil_mmi.c libavcodec/sh4/dsputil_align.c libavcodec/sh4/dsputil_sh4.c libavcodec/sparc/dsputil_vis.c libavcodec/utils.c libavcodec/version.h libavcodec/x86/dsputil_mmx.c libavformat/options.c libavformat/utils.c libavutil/pixfmt.h libswscale/swscale.c libswscale/swscale_internal.h libswscale/swscale_template.c tests/ref/seek/lavf_avi Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-05-11 05:47:02 +02:00
..
bfin	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
mlib	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
ppc	swscale: correct include path to fix ppc altivec build	2011-04-15 00:41:10 +02:00
sparc	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
x86	Patch from Packman (OpenSuse - packages) to silence rpmlint.	2011-04-25 19:53:47 +02:00
colorspace-test.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
libswscale.v	Add symbol versioning for shared libraries	2010-01-16 04:48:55 +00:00
Makefile	swscale: move away x86 specific code from rgb2rgb	2011-04-14 22:16:47 +02:00
options.c	AVOptions: make default_val a union, as proposed in AVOption2.	2011-05-10 20:22:06 +02:00
rgb2rgb_template.c	rgb24toyv12: break out in the middle before out of array reads.	2011-05-05 02:20:20 +02:00
rgb2rgb.c	Fix runtime CPU detection in libswscale.	2011-04-27 01:52:36 +02:00
rgb2rgb.h	sws: remove disabled cruft.	2011-04-19 21:50:12 +02:00
swscale_internal.h	Add pixel formats for 9- and 10-bit yuv420p.	2011-05-10 07:24:19 -04:00
swscale_template.c	Add pixel formats for 9- and 10-bit yuv420p.	2011-05-10 07:24:19 -04:00
swscale-test.c	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
swscale.c	swscale: Fix scaling for unscaled dithered planar convertions.	2011-05-10 14:43:34 +02:00
swscale.h	Merge remote branch 'qatar/master'	2011-04-29 04:29:21 +02:00
utils.c	Merge remote branch 'qatar/master'	2011-05-11 05:47:02 +02:00
yuv2rgb.c	libswcale: PIX_FMT_BGR48LE and PIX_FMT_BGR48BE scaler implementation	2011-04-28 07:25:27 +02:00