Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Dec 2011 22:24:53 +0000 (23:24 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 31 Dec 2011 23:07:31 +0000 (00:07 +0100)
commit4478e9d8db65ca827f2b3ef3ef6ee806bffdba45
tree795fe15fd00d5682450ca31aa25ecaf7fc0c3ee1
parent2cba62bd84d15e84633b982f868fb1e50834c0d8
parentfebd022228660cb4b4d0e7b108bfec339b7dce92
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>
20 files changed:
Changelog
configure
libavcodec/cook.c
libavcodec/mpegaudiodec.c
libavcodec/options.c
libavcodec/pthread.c
libavcodec/version.h
libavformat/utils.c
tests/Makefile
tests/ref/fate/dfa1
tests/ref/fate/dfa10
tests/ref/fate/dfa11
tests/ref/fate/dfa2
tests/ref/fate/dfa3
tests/ref/fate/dfa4
tests/ref/fate/dfa5
tests/ref/fate/dfa6
tests/ref/fate/dfa7
tests/ref/fate/dfa8
tests/ref/fate/dfa9