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>

13 files changed, 199 insertions, 0 deletions

diff --git a/tests/Makefile b/tests/Makefile
index 72d29f9734..51ff9182b7 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -49,6 +49,7 @@ include $(SRC_PATH)/tests/fate/atrac.mak
 include $(SRC_PATH)/tests/fate/audio.mak
 include $(SRC_PATH)/tests/fate/dct.mak
 include $(SRC_PATH)/tests/fate/demux.mak
+include $(SRC_PATH)/tests/fate/dfa.mak
 include $(SRC_PATH)/tests/fate/dpcm.mak
 include $(SRC_PATH)/tests/fate/ea.mak
 include $(SRC_PATH)/tests/fate/fft.mak
diff --git a/tests/fate/dfa.mak b/tests/fate/dfa.mak
new file mode 100644
index 0000000000..1d6bce7fff
--- /dev/null
+++ b/tests/fate/dfa.mak
@@ -0,0 +1,35 @@
+FATE_DFA += fate-dfa1
+fate-dfa1: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0000.dfa
+
+FATE_DFA += fate-dfa2
+fate-dfa2: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0001.dfa
+
+FATE_DFA += fate-dfa3
+fate-dfa3: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0002.dfa
+
+FATE_DFA += fate-dfa4
+fate-dfa4: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0003.dfa
+
+FATE_DFA += fate-dfa5
+fate-dfa5: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0004.dfa
+
+FATE_DFA += fate-dfa6
+fate-dfa6: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0005.dfa
+
+FATE_DFA += fate-dfa7
+fate-dfa7: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0006.dfa
+
+FATE_DFA += fate-dfa8
+fate-dfa8: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0007.dfa
+
+FATE_DFA += fate-dfa9
+fate-dfa9: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0008.dfa
+
+FATE_DFA += fate-dfa10
+fate-dfa10: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0009.dfa
+
+FATE_DFA += fate-dfa11
+fate-dfa11: CMD = framecrc -i $(SAMPLES)/chronomaster-dfa/0010.dfa
+
+FATE_TESTS += $(FATE_DFA)
+fate-dfa: $(FATE_DFA)
diff --git a/tests/ref/fate/dfa1 b/tests/ref/fate/dfa1
new file mode 100644
index 0000000000..8b1bbba0e1
--- /dev/null
+++ b/tests/ref/fate/dfa1
@@ -0,0 +1,25 @@
+0, 0, 308224, 0x7264439e
+0, 11520, 308224, 0xe1734f4b
+0, 23040, 308224, 0x9cfe28a4
+0, 34560, 308224, 0xebb6ec8b
+0, 46080, 308224, 0xaef16ca7
+0, 57600, 308224, 0x0390b439
+0, 69120, 308224, 0xe69bd008
+0, 80640, 308224, 0xa1818468
+0, 92160, 308224, 0x9d6e7d82
+0, 103680, 308224, 0x54971a9e
+0, 115200, 308224, 0xe14e15a8
+0, 126720, 308224, 0xa026cf3f
+0, 138240, 308224, 0xf8921be4
+0, 149760, 308224, 0xf49a42cc
+0, 161280, 308224, 0xa4108f17
+0, 172800, 308224, 0xfa79cbfe
+0, 184320, 308224, 0x3431f47b
+0, 195840, 308224, 0x72aa3426
+0, 207360, 308224, 0x81159f85
+0, 218880, 308224, 0x04bcb289
+0, 230400, 308224, 0xb1dabbcd
+0, 241920, 308224, 0x7e851c8c
+0, 253440, 308224, 0x8bdea0bf
+0, 264960, 308224, 0xecacdb11
+0, 276480, 308224, 0xec4c6c41
diff --git a/tests/ref/fate/dfa10 b/tests/ref/fate/dfa10
new file mode 100644
index 0000000000..72a32043b8
--- /dev/null
+++ b/tests/ref/fate/dfa10
@@ -0,0 +1,8 @@
+0, 0, 65024, 0x8f31c3f0
+0, 6390, 65024, 0x164a2d82
+0, 12780, 65024, 0xbb72b738
+0, 19170, 65024, 0x45b93e3a
+0, 25560, 65024, 0xcc4019df
+0, 31950, 65024, 0x64644557
+0, 38340, 65024, 0xb4584b28
+0, 44730, 65024, 0x1d87966a
diff --git a/tests/ref/fate/dfa11 b/tests/ref/fate/dfa11
new file mode 100644
index 0000000000..cda4cbc502
--- /dev/null
+++ b/tests/ref/fate/dfa11
@@ -0,0 +1,9 @@
+0, 0, 65024, 0x10db5645
+0, 6390, 65024, 0xb5d8a5bd
+0, 12780, 65024, 0xc9555f27
+0, 19170, 65024, 0x74c43f84
+0, 25560, 65024, 0x5b2445b0
+0, 31950, 65024, 0x8bd5be38
+0, 38340, 65024, 0x75ec97da
+0, 44730, 65024, 0x34416636
+0, 51120, 65024, 0x9cc2abcf
diff --git a/tests/ref/fate/dfa2 b/tests/ref/fate/dfa2
new file mode 100644
index 0000000000..101fa2cc81
--- /dev/null
+++ b/tests/ref/fate/dfa2
@@ -0,0 +1,17 @@
+0, 0, 308224, 0x8dc9803f
+0, 6390, 308224, 0x06308b37
+0, 12780, 308224, 0xb8cb7be6
+0, 19170, 308224, 0xc538862b
+0, 25560, 308224, 0x8d4b7702
+0, 31950, 308224, 0x97a479f0
+0, 38340, 308224, 0x63d08e67
+0, 44730, 308224, 0x470e8a18
+0, 51120, 308224, 0x08aa6be4
+0, 57510, 308224, 0x3b2f6f9a
+0, 63900, 308224, 0xf0f1490c
+0, 70290, 308224, 0xcb8b2ec5
+0, 76680, 308224, 0xab361e75
+0, 83070, 308224, 0x485aed6d
+0, 89460, 308224, 0xd3e7ecb7
+0, 95850, 308224, 0xa2c0d561
+0, 102240, 308224, 0xd8f8ccd4
diff --git a/tests/ref/fate/dfa3 b/tests/ref/fate/dfa3
new file mode 100644
index 0000000000..f200ac5225
--- /dev/null
+++ b/tests/ref/fate/dfa3
@@ -0,0 +1,10 @@
+0, 0, 65024, 0xbf9d558b
+0, 9000, 65024, 0x4c7ea2ac
+0, 18000, 65024, 0x4931827c
+0, 27000, 65024, 0x5a9e09a7
+0, 36000, 65024, 0x2b76eca9
+0, 45000, 65024, 0xd5400a96
+0, 54000, 65024, 0xcca17f23
+0, 63000, 65024, 0xebca0dec
+0, 72000, 65024, 0x07a73cfc
+0, 81000, 65024, 0xdd5e4620
diff --git a/tests/ref/fate/dfa4 b/tests/ref/fate/dfa4
new file mode 100644
index 0000000000..94760d0bc1
--- /dev/null
+++ b/tests/ref/fate/dfa4
@@ -0,0 +1,13 @@
+0, 0, 308224, 0x5a24821c
+0, 12780, 308224, 0xa1ecf793
+0, 25560, 308224, 0xcb91afa5
+0, 38340, 308224, 0x8b7e85b9
+0, 51120, 308224, 0xe4755628
+0, 63900, 308224, 0xe4755628
+0, 76680, 308224, 0xe4755628
+0, 89460, 308224, 0xe4755628
+0, 102240, 308224, 0xe4755628
+0, 115020, 308224, 0xe4755628
+0, 127800, 308224, 0xdd6ca523
+0, 140580, 308224, 0x961ba417
+0, 153360, 308224, 0x5ed15e7f
diff --git a/tests/ref/fate/dfa5 b/tests/ref/fate/dfa5
new file mode 100644
index 0000000000..4aaacde6db
--- /dev/null
+++ b/tests/ref/fate/dfa5
@@ -0,0 +1,15 @@
+0, 0, 65024, 0x54831a1a
+0, 9000, 65024, 0x110f5bad
+0, 18000, 65024, 0xdd4f97fa
+0, 27000, 65024, 0x1ab375b2
+0, 36000, 65024, 0x311b51d3
+0, 45000, 65024, 0xb0614f71
+0, 54000, 65024, 0x6d968927
+0, 63000, 65024, 0x28d85028
+0, 72000, 65024, 0x74ea41f5
+0, 81000, 65024, 0x3480b067
+0, 90000, 65024, 0x3e1115d4
+0, 99000, 65024, 0x0c715b57
+0, 108000, 65024, 0x3acaaea3
+0, 117000, 65024, 0x1b60f1e8
+0, 126000, 65024, 0xcee14632
diff --git a/tests/ref/fate/dfa6 b/tests/ref/fate/dfa6
new file mode 100644
index 0000000000..9adb612775
--- /dev/null
+++ b/tests/ref/fate/dfa6
@@ -0,0 +1,12 @@
+0, 0, 65024, 0x190f2398
+0, 6390, 65024, 0x19d8c3e0
+0, 12780, 65024, 0x848020a2
+0, 19170, 65024, 0xbb64696f
+0, 25560, 65024, 0x85886472
+0, 31950, 65024, 0xc9c26668
+0, 38340, 65024, 0xf24d1524
+0, 44730, 65024, 0x64d98cd0
+0, 51120, 65024, 0xa1323b5e
+0, 57510, 65024, 0x9f48dcf9
+0, 63900, 65024, 0x1a0591da
+0, 70290, 65024, 0x8eabf12e
diff --git a/tests/ref/fate/dfa7 b/tests/ref/fate/dfa7
new file mode 100644
index 0000000000..33cc0fbee7
--- /dev/null
+++ b/tests/ref/fate/dfa7
@@ -0,0 +1,12 @@
+0, 0, 3648, 0xb6174031
+0, 6390, 3648, 0x2e4649b0
+0, 12780, 3648, 0xe05247cb
+0, 19170, 3648, 0x003941f0
+0, 25560, 3648, 0xa2563fed
+0, 31950, 3648, 0x23d34cf1
+0, 38340, 3648, 0x624f5173
+0, 44730, 3648, 0xc07a491e
+0, 51120, 3648, 0x74214090
+0, 57510, 3648, 0xebfd469c
+0, 63900, 3648, 0x60083f49
+0, 70290, 3648, 0x6096486f
diff --git a/tests/ref/fate/dfa8 b/tests/ref/fate/dfa8
new file mode 100644
index 0000000000..0f695eec3d
--- /dev/null
+++ b/tests/ref/fate/dfa8
@@ -0,0 +1,36 @@
+0, 0, 45932, 0xf9bc2e69
+0, 6390, 45932, 0x5b8736ad
+0, 12780, 45932, 0x4521ba17
+0, 19170, 45932, 0xf3a374a9
+0, 25560, 45932, 0x3fdfdc70
+0, 31950, 45932, 0x4eb18dbb
+0, 38340, 45932, 0x633c6377
+0, 44730, 45932, 0x77dce8ba
+0, 51120, 45932, 0x8246fecd
+0, 57510, 45932, 0xe8864c0d
+0, 63900, 45932, 0x995740d1
+0, 70290, 45932, 0xc8a298ee
+0, 76680, 45932, 0xa3535672
+0, 83070, 45932, 0xb553f58b
+0, 89460, 45932, 0x8a5b3b92
+0, 95850, 45932, 0x1bcd50b0
+0, 102240, 45932, 0xf22b0531
+0, 108630, 45932, 0x5f62bc78
+0, 115020, 45932, 0xc669075f
+0, 121410, 45932, 0xae3b4e80
+0, 127800, 45932, 0x3f52062f
+0, 134190, 45932, 0xde97a978
+0, 140580, 45932, 0x3ba7ca71
+0, 146970, 45932, 0xe418aba1
+0, 153360, 45932, 0xb8b3f24b
+0, 159750, 45932, 0xd054791d
+0, 166140, 45932, 0xddf121ce
+0, 172530, 45932, 0xf0dcdd42
+0, 178920, 45932, 0xd5aa9281
+0, 185310, 45932, 0xffe8450b
+0, 191700, 45932, 0x84f9424a
+0, 198090, 45932, 0xe6c7592e
+0, 204480, 45932, 0xc29c492d
+0, 210870, 45932, 0x87186732
+0, 217260, 45932, 0x02c73e12
+0, 223650, 45932, 0x32eb90c8
diff --git a/tests/ref/fate/dfa9 b/tests/ref/fate/dfa9
new file mode 100644
index 0000000000..d7a6a11a8c
--- /dev/null
+++ b/tests/ref/fate/dfa9
@@ -0,0 +1,6 @@
+0, 0, 77076, 0x33b3bf99
+0, 6390, 77076, 0xde70a282
+0, 12780, 77076, 0x8d4c10a4
+0, 19170, 77076, 0xeb536bcc
+0, 25560, 77076, 0x86cce3e8
+0, 31950, 77076, 0x292df285