Merge commit '8dde92b95a197eb809d798aacb34dbe52a0689a8'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:44:19 +0000 (23:44 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Sun, 8 May 2016 22:46:58 +0000 (23:46 +0100)
* commit '8dde92b95a197eb809d798aacb34dbe52a0689a8':
  fate: Update Screenpresso tests

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>
1  2 
tests/fate/screen.mak
tests/ref/fate/screenpresso-16bit
tests/ref/fate/screenpresso-24bit
tests/ref/fate/screenpresso-32bit

Simple merge
index 0000000,d9a7d89..88c33a6
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,9 +1,13 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 320x240
++#sar 0: 0/1
+ 0,          0,          0,        1,   153600, 0x69a234de
+ 0,          1,          1,        1,   153600, 0x7f43aee5
+ 0,          2,          2,        1,   153600, 0x81030634
+ 0,          3,          3,        1,   153600, 0xf570d0ef
+ 0,          4,          4,        1,   153600, 0x386e8cec
+ 0,          5,          5,        1,   153600, 0xbe53af8f
+ 0,          6,          6,        1,   153600, 0xf92f48bd
+ 0,          7,          7,        1,   153600, 0x594472c5
Simple merge
index 0000000,5e1a3b5..fc06ec2
mode 000000,100644..100644
--- /dev/null
@@@ -1,0 -1,5 +1,9 @@@
+ #tb 0: 100/2397
++#media_type 0: video
++#codec_id 0: rawvideo
++#dimensions 0: 320x240
++#sar 0: 0/1
+ 0,          0,          0,        1,   307200, 0xa01f27cc
+ 0,          1,          1,        1,   307200, 0x5d83c4d0
+ 0,          2,          2,        1,   307200, 0xb7d7919f
+ 0,          3,          3,        1,   307200, 0x4d201450