Merge remote-tracking branch 'qatar/master'

* qatar/master:
  avconv: make -frames work for all types of streams, not just video.
  bfi: K&R cosmetics
  bgmc: K&R cleanup
  rawdec: Set start_time to 0 for raw audio files.
  Detect 'yuv2' as rawvideo also in avi.
  rawdec: propagate pict_type information to the output frame
  rawdec: Support more QT 1bpp rawvideo files.
  avconv: free bitstream filters
  threads: limit the number of automatic threads to MAX_AUTO_THREADS
  avplay: K&R cleanup
  fate: use rgb24 as output format for dfa tests
  threads: set thread_count to 1 when thread support is disabled
  threads: introduce CODEC_CAP_AUTO_THREADS and add it to libx264

Conflicts:
	ffplay.c
	libavcodec/avcodec.h
	libavcodec/pthread.c
	libavcodec/version.h
	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

Merged-by: Michael Niedermayer <michaelni@gmx.at>

11 files changed, 163 insertions, 163 deletions

diff --git a/tests/ref/fate/dfa1 b/tests/ref/fate/dfa1
index 8b1bbba0e1..31a0115b86 100644
--- a/tests/ref/fate/dfa1
+++ b/tests/ref/fate/dfa1
@@ -1,25 +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
+0, 0, 921600, 0xb69faa34
+0, 11520, 921600, 0x38680829
+0, 23040, 921600, 0xa7263c5a
+0, 34560, 921600, 0xa784626a
+0, 46080, 921600, 0xb4c47212
+0, 57600, 921600, 0xd17285ea
+0, 69120, 921600, 0xe9b33902
+0, 80640, 921600, 0x215ea693
+0, 92160, 921600, 0xe2ab6c7a
+0, 103680, 921600, 0xf2867624
+0, 115200, 921600, 0x607d78c1
+0, 126720, 921600, 0x6e743bb7
+0, 138240, 921600, 0x1fbf8f5a
+0, 149760, 921600, 0xac6c912e
+0, 161280, 921600, 0x556933bc
+0, 172800, 921600, 0xda4c242b
+0, 184320, 921600, 0xa6b32f83
+0, 195840, 921600, 0x1ecc2996
+0, 207360, 921600, 0xf1c3fc0f
+0, 218880, 921600, 0x3f1db909
+0, 230400, 921600, 0x7582fb93
+0, 241920, 921600, 0x102ba261
+0, 253440, 921600, 0xfbcf9de0
+0, 264960, 921600, 0xe9ecb4d9
+0, 276480, 921600, 0x7ee36a42
diff --git a/tests/ref/fate/dfa10 b/tests/ref/fate/dfa10
index 72a32043b8..40da4e16b6 100644
--- a/tests/ref/fate/dfa10
+++ b/tests/ref/fate/dfa10
@@ -1,8 +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
+0, 0, 192000, 0x7384f9b2
+0, 6390, 192000, 0xd1f61c71
+0, 12780, 192000, 0x0c6937d1
+0, 19170, 192000, 0x56459a3a
+0, 25560, 192000, 0x6d011790
+0, 31950, 192000, 0xb5347ce8
+0, 38340, 192000, 0xcd422568
+0, 44730, 192000, 0xde4fef2d
diff --git a/tests/ref/fate/dfa11 b/tests/ref/fate/dfa11
index cda4cbc502..53a3bed8df 100644
--- a/tests/ref/fate/dfa11
+++ b/tests/ref/fate/dfa11
@@ -1,9 +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
+0, 0, 192000, 0x4269d703
+0, 6390, 192000, 0xdf8667e7
+0, 12780, 192000, 0x450026ad
+0, 19170, 192000, 0x2528ea52
+0, 25560, 192000, 0x83bcd1ec
+0, 31950, 192000, 0x88d5ba27
+0, 38340, 192000, 0x44424577
+0, 44730, 192000, 0xd93f12a3
+0, 51120, 192000, 0xcd625f3e
diff --git a/tests/ref/fate/dfa2 b/tests/ref/fate/dfa2
index 101fa2cc81..2faad6e552 100644
--- a/tests/ref/fate/dfa2
+++ b/tests/ref/fate/dfa2
@@ -1,17 +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
+0, 0, 921600, 0x8a5d15df
+0, 6390, 921600, 0x92c01362
+0, 12780, 921600, 0xe1a31643
+0, 19170, 921600, 0x37a90fe2
+0, 25560, 921600, 0x74410783
+0, 31950, 921600, 0xecf4ef1a
+0, 38340, 921600, 0x4d7ff3d4
+0, 44730, 921600, 0xac820317
+0, 51120, 921600, 0xbe5ff56e
+0, 57510, 921600, 0x8e59c329
+0, 63900, 921600, 0x73bf23f3
+0, 70290, 921600, 0xb90c780f
+0, 76680, 921600, 0xfbd9dc32
+0, 83070, 921600, 0x30586821
+0, 89460, 921600, 0x6695195b
+0, 95850, 921600, 0xc449aa85
+0, 102240, 921600, 0xca6a391c
diff --git a/tests/ref/fate/dfa3 b/tests/ref/fate/dfa3
index f200ac5225..68ba09e4ee 100644
--- a/tests/ref/fate/dfa3
+++ b/tests/ref/fate/dfa3
@@ -1,10 +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
+0, 0, 192000, 0x236a1b54
+0, 9000, 192000, 0xfb438b68
+0, 18000, 192000, 0xde504563
+0, 27000, 192000, 0xfaf88e05
+0, 36000, 192000, 0xe15de5af
+0, 45000, 192000, 0x641fcca4
+0, 54000, 192000, 0x74899cb6
+0, 63000, 192000, 0x93fdb1b4
+0, 72000, 192000, 0x58d83456
+0, 81000, 192000, 0x7d3012ac
diff --git a/tests/ref/fate/dfa4 b/tests/ref/fate/dfa4
index 94760d0bc1..fbf00b658c 100644
--- a/tests/ref/fate/dfa4
+++ b/tests/ref/fate/dfa4
@@ -1,13 +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
+0, 0, 921600, 0xd9e060e3
+0, 12780, 921600, 0x15e28dc7
+0, 25560, 921600, 0x78e8bfbc
+0, 38340, 921600, 0xe9407075
+0, 51120, 921600, 0xab818b8a
+0, 63900, 921600, 0xab818b8a
+0, 76680, 921600, 0xab818b8a
+0, 89460, 921600, 0xab818b8a
+0, 102240, 921600, 0xab818b8a
+0, 115020, 921600, 0xab818b8a
+0, 127800, 921600, 0xad5ad11c
+0, 140580, 921600, 0xe6e50f8c
+0, 153360, 921600, 0x9f127099
diff --git a/tests/ref/fate/dfa5 b/tests/ref/fate/dfa5
index 4aaacde6db..4b9a9926ee 100644
--- a/tests/ref/fate/dfa5
+++ b/tests/ref/fate/dfa5
@@ -1,15 +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
+0, 0, 192000, 0x9754890f
+0, 9000, 192000, 0x01668965
+0, 18000, 192000, 0xbd1b5e12
+0, 27000, 192000, 0x2e97fb9f
+0, 36000, 192000, 0xf8b452e2
+0, 45000, 192000, 0xc6859449
+0, 54000, 192000, 0x910844f7
+0, 63000, 192000, 0x99443581
+0, 72000, 192000, 0xec52d1e5
+0, 81000, 192000, 0x2fc66c35
+0, 90000, 192000, 0xd9af7379
+0, 99000, 192000, 0x947a26ef
+0, 108000, 192000, 0x7b77ab28
+0, 117000, 192000, 0x2507637e
+0, 126000, 192000, 0x6ce8c0ea
diff --git a/tests/ref/fate/dfa6 b/tests/ref/fate/dfa6
index 9adb612775..a59c7ff498 100644
--- a/tests/ref/fate/dfa6
+++ b/tests/ref/fate/dfa6
@@ -1,12 +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
+0, 0, 192000, 0xb718dc63
+0, 6390, 192000, 0x2efb7b89
+0, 12780, 192000, 0x70827047
+0, 19170, 192000, 0x61e1fd2f
+0, 25560, 192000, 0x06f8bccd
+0, 31950, 192000, 0xf0362404
+0, 38340, 192000, 0xc00fc1b8
+0, 44730, 192000, 0x94265476
+0, 51120, 192000, 0x4b50ad23
+0, 57510, 192000, 0x4d578b60
+0, 63900, 192000, 0xfb14b875
+0, 70290, 192000, 0x81682338
diff --git a/tests/ref/fate/dfa7 b/tests/ref/fate/dfa7
index 33cc0fbee7..dce4264dd6 100644
--- a/tests/ref/fate/dfa7
+++ b/tests/ref/fate/dfa7
@@ -1,12 +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
+0, 0, 7866, 0xab73dae7
+0, 6390, 7866, 0x100adec8
+0, 12780, 7866, 0x1a20ddfa
+0, 19170, 7866, 0xc358cd16
+0, 25560, 7866, 0xee0bd20e
+0, 31950, 7866, 0xef26bef9
+0, 38340, 7866, 0xa9d0c755
+0, 44730, 7866, 0x6c11cc7c
+0, 51120, 7866, 0x4d6ed988
+0, 57510, 7866, 0x9965cf24
+0, 63900, 7866, 0x9a12db24
+0, 70290, 7866, 0x2e85cfeb
diff --git a/tests/ref/fate/dfa8 b/tests/ref/fate/dfa8
index 0f695eec3d..c58a07633e 100644
--- a/tests/ref/fate/dfa8
+++ b/tests/ref/fate/dfa8
@@ -1,36 +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
+0, 0, 134724, 0x53784ca9
+0, 6390, 134724, 0x14c345b7
+0, 12780, 134724, 0xe0d0dd51
+0, 19170, 134724, 0xd53b5610
+0, 25560, 134724, 0x7cbb8d47
+0, 31950, 134724, 0x875d67c4
+0, 38340, 134724, 0x9811c085
+0, 44730, 134724, 0x25f6d228
+0, 51120, 134724, 0x349495a0
+0, 57510, 134724, 0xd0d75311
+0, 63900, 134724, 0xb49cdfbb
+0, 70290, 134724, 0x9fa69518
+0, 76680, 134724, 0x28a1f58c
+0, 83070, 134724, 0xb8dab657
+0, 89460, 134724, 0x8c7e3b3b
+0, 95850, 134724, 0x37268acf
+0, 102240, 134724, 0xcce8ca02
+0, 108630, 134724, 0xe0fd0c28
+0, 115020, 134724, 0x5bdac906
+0, 121410, 134724, 0xdd850bf0
+0, 127800, 134724, 0x2002a228
+0, 134190, 134724, 0x633617ea
+0, 140580, 134724, 0x2a3ef337
+0, 146970, 134724, 0x507886c3
+0, 153360, 134724, 0x51c0f07b
+0, 159750, 134724, 0x5e73dce1
+0, 166140, 134724, 0x26acc6f0
+0, 172530, 134724, 0x360c4349
+0, 178920, 134724, 0xc7dbabd4
+0, 185310, 134724, 0x671bbf66
+0, 191700, 134724, 0x4d44df79
+0, 198090, 134724, 0x69eade5b
+0, 204480, 134724, 0x2b1bca82
+0, 210870, 134724, 0x8b16af47
+0, 217260, 134724, 0xb59fa1bd
+0, 223650, 134724, 0x2ec17c24
diff --git a/tests/ref/fate/dfa9 b/tests/ref/fate/dfa9
index d7a6a11a8c..82b763fb87 100644
--- a/tests/ref/fate/dfa9
+++ b/tests/ref/fate/dfa9
@@ -1,6 +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
+0, 0, 228150, 0xde68df49
+0, 6390, 228150, 0x8e12bcaf
+0, 12780, 228150, 0x851b04f7
+0, 19170, 228150, 0x7e5e0950
+0, 25560, 228150, 0x1d92219f
+0, 31950, 228150, 0x93caa693