Merge commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2'

* commit '5c018ee18895f88e9e1d2174059dcdd48bf872d2':
  DirectDraw Surface image decoder

Conflicts:
	Changelog
	configure
	doc/general.texi
	libavcodec/Makefile
	libavcodec/version.h
	tests/fate/image.mak

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

43 files changed, 86 insertions, 0 deletions

diff --git a/tests/ref/fate/dds-argb b/tests/ref/fate/dds-argb
new file mode 100644
index 0000000..fbde424
--- /dev/null
+++ b/tests/ref/fate/dds-argb
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    56320, 0xfcaa920b
diff --git a/tests/ref/fate/dds-argb-aexp b/tests/ref/fate/dds-argb-aexp
new file mode 100644
index 0000000..f52410f
--- /dev/null
+++ b/tests/ref/fate/dds-argb-aexp
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfdd37c43
diff --git a/tests/ref/fate/dds-dx10-bc1 b/tests/ref/fate/dds-dx10-bc1
new file mode 100644
index 0000000..84efd9f
--- /dev/null
+++ b/tests/ref/fate/dds-dx10-bc1
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xed2f850f
diff --git a/tests/ref/fate/dds-dx10-bc1a b/tests/ref/fate/dds-dx10-bc1a
new file mode 100644
index 0000000..8cb4589
--- /dev/null
+++ b/tests/ref/fate/dds-dx10-bc1a
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x473b484b
diff --git a/tests/ref/fate/dds-dx10-bc2 b/tests/ref/fate/dds-dx10-bc2
new file mode 100644
index 0000000..a25180d
--- /dev/null
+++ b/tests/ref/fate/dds-dx10-bc2
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x2bce3baa
diff --git a/tests/ref/fate/dds-dx10-bc3 b/tests/ref/fate/dds-dx10-bc3
new file mode 100644
index 0000000..296c945
--- /dev/null
+++ b/tests/ref/fate/dds-dx10-bc3
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xb91d3c62
diff --git a/tests/ref/fate/dds-dx10-bc4 b/tests/ref/fate/dds-dx10-bc4
new file mode 100644
index 0000000..4583d25
--- /dev/null
+++ b/tests/ref/fate/dds-dx10-bc4
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfdfd1751
diff --git a/tests/ref/fate/dds-dx10-bc5 b/tests/ref/fate/dds-dx10-bc5
new file mode 100644
index 0000000..bf595eb
--- /dev/null
+++ b/tests/ref/fate/dds-dx10-bc5
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x79bd207e
diff --git a/tests/ref/fate/dds-dxt1 b/tests/ref/fate/dds-dxt1
new file mode 100644
index 0000000..2477406
--- /dev/null
+++ b/tests/ref/fate/dds-dxt1
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0xf52adc80
diff --git a/tests/ref/fate/dds-dxt1-normalmap b/tests/ref/fate/dds-dxt1-normalmap
new file mode 100644
index 0000000..3f77547
--- /dev/null
+++ b/tests/ref/fate/dds-dxt1-normalmap
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x2b411855
diff --git a/tests/ref/fate/dds-dxt1a b/tests/ref/fate/dds-dxt1a
new file mode 100644
index 0000000..05be314
--- /dev/null
+++ b/tests/ref/fate/dds-dxt1a
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xcabb50ea
diff --git a/tests/ref/fate/dds-dxt2 b/tests/ref/fate/dds-dxt2
new file mode 100644
index 0000000..40bcf6e
--- /dev/null
+++ b/tests/ref/fate/dds-dxt2
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x11cebeb0
diff --git a/tests/ref/fate/dds-dxt3 b/tests/ref/fate/dds-dxt3
new file mode 100644
index 0000000..41401da
--- /dev/null
+++ b/tests/ref/fate/dds-dxt3
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x729b74ba
diff --git a/tests/ref/fate/dds-dxt4 b/tests/ref/fate/dds-dxt4
new file mode 100644
index 0000000..dc5d73f
--- /dev/null
+++ b/tests/ref/fate/dds-dxt4
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x31aaacd6
diff --git a/tests/ref/fate/dds-dxt5 b/tests/ref/fate/dds-dxt5
new file mode 100644
index 0000000..399d6d9
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfd3166aa
diff --git a/tests/ref/fate/dds-dxt5-aexp b/tests/ref/fate/dds-dxt5-aexp
new file mode 100644
index 0000000..ff91afd
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-aexp
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x3c987914
diff --git a/tests/ref/fate/dds-dxt5-normalmap b/tests/ref/fate/dds-dxt5-normalmap
new file mode 100644
index 0000000..680d1b7
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-normalmap
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xd29b1ea1
diff --git a/tests/ref/fate/dds-dxt5-normalmap-ati b/tests/ref/fate/dds-dxt5-normalmap-ati
new file mode 100644
index 0000000..7f088f7
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-normalmap-ati
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x54cb212f
diff --git a/tests/ref/fate/dds-dxt5-rbxg b/tests/ref/fate/dds-dxt5-rbxg
new file mode 100644
index 0000000..7dbecf4
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-rbxg
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x37588d12
diff --git a/tests/ref/fate/dds-dxt5-rgxb b/tests/ref/fate/dds-dxt5-rgxb
new file mode 100644
index 0000000..137913d
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-rgxb
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xfb6b91cf
diff --git a/tests/ref/fate/dds-dxt5-rxbg b/tests/ref/fate/dds-dxt5-rxbg
new file mode 100644
index 0000000..b6e12d3
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-rxbg
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xc6cb8cbe
diff --git a/tests/ref/fate/dds-dxt5-rxgb b/tests/ref/fate/dds-dxt5-rxgb
new file mode 100644
index 0000000..a4190d5
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-rxgb
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xb67d936a
diff --git a/tests/ref/fate/dds-dxt5-xgbr b/tests/ref/fate/dds-dxt5-xgbr
new file mode 100644
index 0000000..95404f2
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-xgbr
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xb0e69293
diff --git a/tests/ref/fate/dds-dxt5-xgxr b/tests/ref/fate/dds-dxt5-xgxr
new file mode 100644
index 0000000..3ed73c3
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-xgxr
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xa93de1ad
diff --git a/tests/ref/fate/dds-dxt5-xrbg b/tests/ref/fate/dds-dxt5-xrbg
new file mode 100644
index 0000000..f647955
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-xrbg
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xf20d8b69
diff --git a/tests/ref/fate/dds-dxt5-ycocg b/tests/ref/fate/dds-dxt5-ycocg
new file mode 100644
index 0000000..1dd8bef
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-ycocg
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x0d0c8d20
diff --git a/tests/ref/fate/dds-dxt5-ycocg-scaled b/tests/ref/fate/dds-dxt5-ycocg-scaled
new file mode 100644
index 0000000..5a70b49
--- /dev/null
+++ b/tests/ref/fate/dds-dxt5-ycocg-scaled
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x5a089973
diff --git a/tests/ref/fate/dds-pal b/tests/ref/fate/dds-pal
new file mode 100644
index 0000000..8541441
--- /dev/null
+++ b/tests/ref/fate/dds-pal
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    65536, 0xbffee5cd
diff --git a/tests/ref/fate/dds-pal-ati b/tests/ref/fate/dds-pal-ati
new file mode 100644
index 0000000..6b43bb4
--- /dev/null
+++ b/tests/ref/fate/dds-pal-ati
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x23068060
diff --git a/tests/ref/fate/dds-rgb16 b/tests/ref/fate/dds-rgb16
new file mode 100644
index 0000000..96e7368
--- /dev/null
+++ b/tests/ref/fate/dds-rgb16
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0x1ec4fed2
diff --git a/tests/ref/fate/dds-rgb24 b/tests/ref/fate/dds-rgb24
new file mode 100644
index 0000000..bc7724d
--- /dev/null
+++ b/tests/ref/fate/dds-rgb24
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0xcf0f7833
diff --git a/tests/ref/fate/dds-rgtc1s b/tests/ref/fate/dds-rgtc1s
new file mode 100644
index 0000000..5085962
--- /dev/null
+++ b/tests/ref/fate/dds-rgtc1s
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xcda652a4
diff --git a/tests/ref/fate/dds-rgtc1u b/tests/ref/fate/dds-rgtc1u
new file mode 100644
index 0000000..b7cff66
--- /dev/null
+++ b/tests/ref/fate/dds-rgtc1u
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x629a1b44
diff --git a/tests/ref/fate/dds-rgtc2s b/tests/ref/fate/dds-rgtc2s
new file mode 100644
index 0000000..7227602
--- /dev/null
+++ b/tests/ref/fate/dds-rgtc2s
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xa0135ca8
diff --git a/tests/ref/fate/dds-rgtc2u b/tests/ref/fate/dds-rgtc2u
new file mode 100644
index 0000000..0b6678b
--- /dev/null
+++ b/tests/ref/fate/dds-rgtc2u
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x38cb221a
diff --git a/tests/ref/fate/dds-rgtc2u-xy b/tests/ref/fate/dds-rgtc2u-xy
new file mode 100644
index 0000000..bf595eb
--- /dev/null
+++ b/tests/ref/fate/dds-rgtc2u-xy
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x79bd207e
diff --git a/tests/ref/fate/dds-uyvy b/tests/ref/fate/dds-uyvy
new file mode 100644
index 0000000..6ea3f2e
--- /dev/null
+++ b/tests/ref/fate/dds-uyvy
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xd579a59e
diff --git a/tests/ref/fate/dds-xbgr b/tests/ref/fate/dds-xbgr
new file mode 100644
index 0000000..63e5225
--- /dev/null
+++ b/tests/ref/fate/dds-xbgr
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x702f6a28
diff --git a/tests/ref/fate/dds-xrgb b/tests/ref/fate/dds-xrgb
new file mode 100644
index 0000000..63e5225
--- /dev/null
+++ b/tests/ref/fate/dds-xrgb
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x702f6a28
diff --git a/tests/ref/fate/dds-y b/tests/ref/fate/dds-y
new file mode 100644
index 0000000..5b2f11b
--- /dev/null
+++ b/tests/ref/fate/dds-y
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    32768, 0xc51add1c
diff --git a/tests/ref/fate/dds-ya b/tests/ref/fate/dds-ya
new file mode 100644
index 0000000..59e3203
--- /dev/null
+++ b/tests/ref/fate/dds-ya
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    56320, 0xa614eb1e
diff --git a/tests/ref/fate/dds-ycocg b/tests/ref/fate/dds-ycocg
new file mode 100644
index 0000000..f3dd727
--- /dev/null
+++ b/tests/ref/fate/dds-ycocg
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0x4cb08d0a
diff --git a/tests/ref/fate/dds-yuyv b/tests/ref/fate/dds-yuyv
new file mode 100644
index 0000000..6ea3f2e
--- /dev/null
+++ b/tests/ref/fate/dds-yuyv
@@ -0,0 +1,2 @@
+#tb 0: 1/25
+0,          0,          0,        1,    16384, 0xd579a59e