Michael Niedermayer 4478e9d8db Merge remote-tracking branch 'qatar/master' ... * qatar/master: FATE: add tests for dfa mpegaudiodec: fix seeking. mpegaudiodec: fix compilation when testing the unchecked bitstream reader threads: add sysconf based number of CPUs detection threads: always include necessary headers for number of CPUs detection threads: default to automatic thread count detection Changelog: restore version <next> header cook: K&R formatting cosmetics Conflicts: Changelog libavcodec/version.h Merged-by: Michael Niedermayer <michaelni@gmx.at>		2012-01-01 00:07:31 +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-01 00:07:31 +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