[FFmpeg-cvslog] Merge commit '00658253e237ab975ae2d384e02b5936781f103d'

[Derek Buitenhuis]

ffmpeg | branch: master | Derek Buitenhuis <derek.buitenhuis at gmail.com> | Sun May  8 23:50:29 2016 +0100| [68b8505d4d3fae0c4e7865788519b2c703b8338b] | committer: Derek Buitenhuis

Merge commit '00658253e237ab975ae2d384e02b5936781f103d'

* commit '00658253e237ab975ae2d384e02b5936781f103d':
  fate: Update DDS tests

Merged-by: Derek Buitenhuis <derek.buitenhuis at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=68b8505d4d3fae0c4e7865788519b2c703b8338b
---

 tests/fate/image.mak       |    2 +-
 tests/ref/fate/dds-alpha8  |    6 ++++++
 tests/ref/fate/dds-rgb1555 |    6 ++++++
 tests/ref/fate/dds-rgb555  |    6 ++++++
 4 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/tests/fate/image.mak b/tests/fate/image.mak
index 9e0736b..d6084ed 100644
--- a/tests/fate/image.mak
+++ b/tests/fate/image.mak
@@ -37,7 +37,7 @@ endef
 
 DDS_OPTS_pal     = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba
 DDS_OPTS_pal-ati = -sws_flags +accurate_rnd+bitexact -pix_fmt rgba
-DDS_FMT = argb argb-aexp dx10-bc1 dx10-bc1a dx10-bc2 dx10-bc3 dx10-bc4 dx10-bc5 dxt1 dxt1a dxt1-normalmap dxt2 dxt3 dxt4 dxt5 dxt5-aexp dxt5-normalmap dxt5-normalmap-ati dxt5-rbxg dxt5-rgxb dxt5-rxbg dxt5-rxgb dxt5-xgbr dxt5-xgxr dxt5-xrbg dxt5-ycocg dxt5-ycocg-scaled pal pal-ati rgb16 rgb24 rgba rgtc1s rgtc1u rgtc2s rgtc2u rgtc2u-xy uyvy xbgr xrgb y ya ycocg yuyv
+DDS_FMT = alpha8 argb argb-aexp dx10-bc1 dx10-bc1a dx10-bc2 dx10-bc3 dx10-bc4 dx10-bc5 dxt1 dxt1a dxt1-normalmap dxt2 dxt3 dxt4 dxt5 dxt5-aexp dxt5-normalmap dxt5-normalmap-ati dxt5-rbxg dxt5-rgxb dxt5-rxbg dxt5-rxgb dxt5-xgbr dxt5-xgxr dxt5-xrbg dxt5-ycocg dxt5-ycocg-scaled pal pal-ati rgb1555 rgb16 rgb24 rgb555 rgba rgtc1s rgtc1u rgtc2s rgtc2u rgtc2u-xy uyvy xbgr xrgb y ya ycocg yuyv
 $(foreach FMT,$(DDS_FMT),$(eval $(call FATE_IMGSUITE_DDS,$(FMT))))
 
 FATE_DDS-$(call DEMDEC, IMAGE2, DDS) += $(FATE_DDS)
diff --git a/tests/ref/fate/dds-alpha8 b/tests/ref/fate/dds-alpha8
new file mode 100644
index 0000000..7358684
--- /dev/null
+++ b/tests/ref/fate/dds-alpha8
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 122x122
+#sar 0: 0/1
+0,          0,          0,        1,    14884, 0xf81c47f5
diff --git a/tests/ref/fate/dds-rgb1555 b/tests/ref/fate/dds-rgb1555
new file mode 100644
index 0000000..95e701f
--- /dev/null
+++ b/tests/ref/fate/dds-rgb1555
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 122x122
+#sar 0: 0/1
+0,          0,          0,        1,    29768, 0xbdc099db
diff --git a/tests/ref/fate/dds-rgb555 b/tests/ref/fate/dds-rgb555
new file mode 100644
index 0000000..70c320e
--- /dev/null
+++ b/tests/ref/fate/dds-rgb555
@@ -0,0 +1,6 @@
+#tb 0: 1/25
+#media_type 0: video
+#codec_id 0: rawvideo
+#dimensions 0: 122x122
+#sar 0: 0/1
+0,          0,          0,        1,    29768, 0x277d8628


======================================================================

diff --cc tests/ref/fate/dds-alpha8
index 0000000,fbda288..7358684
mode 000000,100644..100644
--- a/tests/ref/fate/dds-alpha8
+++ b/tests/ref/fate/dds-alpha8
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 1/25
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 122x122
++#sar 0: 0/1
+ 0,          0,          0,        1,    14884, 0xf81c47f5
diff --cc tests/ref/fate/dds-rgb1555
index 0000000,a23d0e5..95e701f
mode 000000,100644..100644
--- a/tests/ref/fate/dds-rgb1555
+++ b/tests/ref/fate/dds-rgb1555
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 1/25
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 122x122
++#sar 0: 0/1
+ 0,          0,          0,        1,    29768, 0xbdc099db
diff --cc tests/ref/fate/dds-rgb555
index 0000000,65ac119..70c320e
mode 000000,100644..100644
--- a/tests/ref/fate/dds-rgb555
+++ b/tests/ref/fate/dds-rgb555
@@@ -1,0 -1,2 +1,6 @@@
+ #tb 0: 1/25
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 122x122
++#sar 0: 0/1
+ 0,          0,          0,        1,    29768, 0x277d8628