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
..
build_libstagefright	Merge remote-tracking branch 'hexene/stagefright'	2011-10-13 18:04:02 +02:00
clean-diff
cws2fws.c	tests/tools/examples: Replace direct exit() calls by return.	2011-12-08 01:00:58 +01:00
enum_options.c	tools: add a tool for enumerating/printing AVOptions in texinfo format	2011-10-24 14:18:07 +02:00
graph2dot.c	graph2dot: show timebase information for audio links	2011-09-17 01:36:32 +02:00
lavfi-showfiltfmts.c	lavfi-showfiltfmts.c: fix handling of null names	2011-11-26 18:12:25 +01:00
patcheck	Merge remote-tracking branch 'qatar/master'	2011-12-06 01:37:27 +01:00
pktdumper.c	Merge remote-tracking branch 'qatar/master'	2011-10-29 02:08:54 +02:00
probetest.c
qt-faststart.c
trasher.c
unwrap-diff