Michael Niedermayer 25b9eef410 Merge remote-tracking branch 'qatar/master' ... * qatar/master: cljr: K&R cosmetics cljr: return a more sensible value when encountering invalid headers cljr: drop unnecessary emms_c() calls without MMX code cljr: remove useless casts cljr: group encode/decode parts under single ifdefs cljr: remove stray semicolon cljr: add missing return statement in decode_end() doc: add pulseaudio to the input list avconv: remove unsubstantiated comment shorten: avoid abort() on unknown audio types cljr: add encoder build: merge lists of HTML documentation targets tests/examples: Mark some variables only used within their files as static. tests/tools/examples: Replace direct exit() calls by return. x86 cpuid: set vendor union members separately cljr: release picture at end of decoding rv40: NEON optimised rv40 qpel motion compensation Conflicts: doc/examples/muxing.c libavcodec/cljr.c libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2011-12-09 00:05:51 +01:00
..
bswap.h
cpu.c	Merge remote-tracking branch 'qatar/master'	2011-12-09 00:05:51 +01:00
intmath.h
intreadwrite.h
timer.h
x86inc.asm	x86inc: Flag shufps as an floating-point instruction for the AVX emulation code.	2011-11-28 00:24:21 +01:00
x86util.asm