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

..

fate

Merge remote-tracking branch 'qatar/master'

2012-01-01 00:07:31 +01:00

ref

Merge remote-tracking branch 'qatar/master'

2012-01-01 00:07:31 +01:00

audiogen.c

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

base64.c

Replace FFmpeg with Libav in licence headers

2011-03-19 13:33:20 +00:00

codec-regression.sh

Merge remote-tracking branch 'qatar/master'

2011-12-29 01:40:34 +01:00

copycooker.sh

build: remove unused copy regression test script

2011-07-07 22:47:24 +02:00

fate_config.sh.template

tests: add a FATE configuration template

2011-11-24 00:33:20 +01:00

fate-run.sh

fate: give stderr hint when a test fails.

2011-12-26 22:27:01 +01:00

fate-update.sh

fate: remove stale fate-update.sh script

2011-03-19 13:35:52 +00:00

fate.sh

fate.sh: Ignore errors from rm command during cleanup.

2011-09-22 17:39:30 +02:00

ffserver-regression.sh

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.conf

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

ffserver.regression.ref

Remove the ffserver test.

2011-08-01 11:36:16 +02:00

lavf-regression.sh

lavf-regression: minimal metadata test.

2011-12-12 20:51:29 +01:00

lavfi-regression.sh

Merge commit 'b2c087871dafc7d030b2d48457ddff597dfd4925'

2011-08-13 02:56:08 +02:00

lena.pnm

finished integrating rotozoom test in ffmpeg

2003-04-11 13:43:17 +00:00

Makefile

Merge remote-tracking branch 'qatar/master'

2012-01-01 00:07:31 +01:00

md5.sh

regtest: add openssl to md5 alternatives

2011-01-18 20:48:24 +00:00

regression-funcs.sh

Run zmbv regression without md5sum.

2011-12-10 19:34:28 +01:00

rotozoom.c

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00

tiny_psnr.c

tests: Remove disabled code.

2011-04-29 18:08:46 +02:00

videogen.c

Merge remote-tracking branch 'qatar/master'

2011-12-13 00:39:48 +01:00