Michael Niedermayer ad1c8dd673 Merge remote-tracking branch 'qatar/master' ... * qatar/master: fate: add dxtory test adx_parser: rewrite. adxdec: Validate channel count to fix a division by zero. adxdec: Do not require extradata. cmdutils: K&R reformatting cosmetics alacdec: implement the 2-pass prediction type. alacenc: implement the 2-pass prediction type. alacenc: do not generate invalid multi-channel ALAC files alacdec: fill in missing or guessed info about the extradata format. utvideo: proper median prediction for interlaced videos lavu: bump lavu minor for av_popcount64 dca: K&R formatting cosmetics dct: K&R formatting cosmetics lavf: flush decoders in avformat_find_stream_info(). win32: detect number of CPUs using affinity Add av_popcount64 snow: Restore three mistakenly removed casts. Conflicts: cmdutils.c doc/APIchanges libavcodec/adx_parser.c libavcodec/adxdec.c libavcodec/alacenc.c libavutil/avutil.h tests/fate/screen.mak Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-04 01:12:34 +01:00
..
acodec	movenc: disable iods by default	2011-12-16 03:50:19 +01:00
fate	Merge remote-tracking branch 'qatar/master'	2012-01-04 01:12:34 +01:00
lavf	lavf-regression: minimal metadata test.	2011-12-12 20:51:29 +01:00
lavfi	Merge remote-tracking branch 'qatar/master'	2011-12-21 03:40:53 +01:00
seek	mxfdec: Hybrid demuxing/seeking solution	2011-12-16 11:54:03 +01:00
vsynth1	cljrdec: improve scaling somewhat	2011-12-28 22:05:24 +01:00
vsynth2	cljrdec: improve scaling somewhat	2011-12-28 22:05:24 +01:00