Michael Niedermayer 367d9b2957 Merge remote-tracking branch 'qatar/master' ... * qatar/master: swscale: K&R formatting cosmetics (part II) tiffdec: Add a malloc check and refactor another. faxcompr: Check malloc results and unify return path configure: escape colons in values written to config.fate ac3dsp: call femms/emms at the end of float_to_fixed24() for 3DNow and SSE matroska: Fix leaking memory allocated for laces. pthread: Fix crash due to fctx->delaying not being cleared. vp3: Assert on invalid filter_limit values. h264: fix 10bit biweight functions after recent x86inc.asm fixes. ffv1: Fix size mismatch in encode_line. movenc: Remove a dead initialization git-howto: Explain how to avoid Windows line endings in git checkouts. build: Move all arch OBJS declarations into arch subdirectory Makefiles. Conflicts: configure libavcodec/vp3.c libavformat/matroskadec.c libavutil/Makefile libswscale/Makefile libswscale/swscale.c libswscale/swscale_internal.h libswscale/utils.c Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-04-13 21:50:37 +02:00
..
bswap.h	Merge remote-tracking branch 'qatar/master'	2011-12-13 00:39:48 +01:00
cpu.c	Detect and check for CMOV.	2012-02-12 18:56:06 +01:00
intmath.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
intreadwrite.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
Makefile	build: Move all arch OBJS declarations into arch subdirectory Makefiles.	2012-04-12 21:30:13 +02:00
timer.h	Replace FFmpeg with Libav in licence headers	2011-03-19 13:33:20 +00:00
w64xmmtest.h	win64: add a XMM clobber test configure option.	2012-02-02 12:00:48 -08:00
x86inc.asm	Merge remote-tracking branch 'qatar/master'	2012-04-13 00:39:19 +02:00
x86util.asm	Merge remote-tracking branch 'qatar/master'	2012-01-28 07:53:34 +01:00