diff --git a/tests/ref/fate/vp60 b/tests/ref/fate/vp60
index 4becf2a8e2..2381c2775a 100644
--- a/tests/ref/fate/vp60
+++ b/tests/ref/fate/vp60
@@ -18,114 +18,114 @@
 0,         12,         12,        1,    55296, 0xe76b7df7
 0,         13,         13,        1,    55296, 0x5a049f33
 0,         14,         14,        1,    55296, 0xc83d9b90
-0,         15,         15,        1,    55296, 0x567877b8
-0,         16,         16,        1,    55296, 0x334c7f6e
-0,         17,         17,        1,    55296, 0x9317945c
-0,         18,         18,        1,    55296, 0xf032831e
-0,         19,         19,        1,    55296, 0x7b6c8d2c
-0,         20,         20,        1,    55296, 0x37109fd6
-0,         21,         21,        1,    55296, 0xe9b0b61b
-0,         22,         22,        1,    55296, 0x7385dae8
-0,         23,         23,        1,    55296, 0x74a8a9f5
-0,         24,         24,        1,    55296, 0xbcd2e218
-0,         25,         25,        1,    55296, 0x0aa6c623
-0,         26,         26,        1,    55296, 0x2224d6d6
-0,         27,         27,        1,    55296, 0x8c8ee4d9
-0,         28,         28,        1,    55296, 0x0d4ceccc
-0,         29,         29,        1,    55296, 0x623f10c7
-0,         30,         30,        1,    55296, 0x13a61f8f
-0,         31,         31,        1,    55296, 0x5343fa8d
-0,         32,         32,        1,    55296, 0x21fef1b5
-0,         33,         33,        1,    55296, 0x380de6b4
-0,         34,         34,        1,    55296, 0x04bedfd3
-0,         35,         35,        1,    55296, 0x428cf510
-0,         36,         36,        1,    55296, 0xbca8c214
-0,         37,         37,        1,    55296, 0x947faa34
-0,         38,         38,        1,    55296, 0x70769f45
-0,         39,         39,        1,    55296, 0xcb9483ad
+0,         15,         15,        1,    55296, 0x464d77d6
+0,         16,         16,        1,    55296, 0x725d7fa2
+0,         17,         17,        1,    55296, 0xc30494d5
+0,         18,         18,        1,    55296, 0x5687839f
+0,         19,         19,        1,    55296, 0x38be8df5
+0,         20,         20,        1,    55296, 0x62afa0ca
+0,         21,         21,        1,    55296, 0x683ab733
+0,         22,         22,        1,    55296, 0xccbedc72
+0,         23,         23,        1,    55296, 0x43c4abc5
+0,         24,         24,        1,    55296, 0xf2f2e3f5
+0,         25,         25,        1,    55296, 0x5fb8c813
+0,         26,         26,        1,    55296, 0x7814d907
+0,         27,         27,        1,    55296, 0xbb87e71a
+0,         28,         28,        1,    55296, 0x41c6ef34
+0,         29,         29,        1,    55296, 0x3f041373
+0,         30,         30,        1,    55296, 0x14b62281
+0,         31,         31,        1,    55296, 0x9a41fddb
+0,         32,         32,        1,    55296, 0x8961f556
+0,         33,         33,        1,    55296, 0x98edea61
+0,         34,         34,        1,    55296, 0x434ae3dd
+0,         35,         35,        1,    55296, 0x0aa4fa23
+0,         36,         36,        1,    55296, 0x0b8bc77f
+0,         37,         37,        1,    55296, 0x79dfafbc
+0,         38,         38,        1,    55296, 0x199ea4da
+0,         39,         39,        1,    55296, 0xd270896d
 0,         40,         40,        1,    55296, 0xac4ea82b
-0,         41,         41,        1,    55296, 0xa3816977
-0,         42,         42,        1,    55296, 0xcfd54ec4
-0,         43,         43,        1,    55296, 0x97743f0e
-0,         44,         44,        1,    55296, 0x4cb4424d
-0,         45,         45,        1,    55296, 0x0b503c11
-0,         46,         46,        1,    55296, 0x879f333a
-0,         47,         47,        1,    55296, 0x6ff9eb8f
-0,         48,         48,        1,    55296, 0x7cd6e5af
-0,         49,         49,        1,    55296, 0x44e2c36f
-0,         50,         50,        1,    55296, 0x4e8993fb
-0,         51,         51,        1,    55296, 0xf0bb9664
-0,         52,         52,        1,    55296, 0xde608458
-0,         53,         53,        1,    55296, 0xb3017f01
-0,         54,         54,        1,    55296, 0x2e096579
-0,         55,         55,        1,    55296, 0xd7295790
-0,         56,         56,        1,    55296, 0xc40b81cb
-0,         57,         57,        1,    55296, 0x53a86e41
-0,         58,         58,        1,    55296, 0x74142f89
-0,         59,         59,        1,    55296, 0x2a1428ce
-0,         60,         60,        1,    55296, 0x5d0c2852
-0,         61,         61,        1,    55296, 0x162058a4
-0,         62,         62,        1,    55296, 0x4e8c6ce8
-0,         63,         63,        1,    55296, 0x1d382af2
-0,         64,         64,        1,    55296, 0x35dd2b75
-0,         65,         65,        1,    55296, 0x1e4c205f
-0,         66,         66,        1,    55296, 0x74a22383
-0,         67,         67,        1,    55296, 0x6ddb237d
-0,         68,         68,        1,    55296, 0xd290263b
-0,         69,         69,        1,    55296, 0xc778249f
+0,         41,         41,        1,    55296, 0x770b6984
+0,         42,         42,        1,    55296, 0x378b4f1a
+0,         43,         43,        1,    55296, 0xe8253faf
+0,         44,         44,        1,    55296, 0xc8224326
+0,         45,         45,        1,    55296, 0x22b33d1b
+0,         46,         46,        1,    55296, 0x83c33475
+0,         47,         47,        1,    55296, 0xbd2aed59
+0,         48,         48,        1,    55296, 0xe058e7e6
+0,         49,         49,        1,    55296, 0x575fc611
+0,         50,         50,        1,    55296, 0x218196dd
+0,         51,         51,        1,    55296, 0x0882998c
+0,         52,         52,        1,    55296, 0x380887dd
+0,         53,         53,        1,    55296, 0x833f82c8
+0,         54,         54,        1,    55296, 0x9db9697b
+0,         55,         55,        1,    55296, 0xb8dd5be8
+0,         56,         56,        1,    55296, 0x1df1869b
+0,         57,         57,        1,    55296, 0xe0bd7399
+0,         58,         58,        1,    55296, 0xc2413536
+0,         59,         59,        1,    55296, 0x90bb2ebf
+0,         60,         60,        1,    55296, 0x6fe72e97
+0,         61,         61,        1,    55296, 0x41385f50
+0,         62,         62,        1,    55296, 0x360973b0
+0,         63,         63,        1,    55296, 0x211d31c4
+0,         64,         64,        1,    55296, 0xe40632a9
+0,         65,         65,        1,    55296, 0xc4052794
+0,         66,         66,        1,    55296, 0x2ff82adf
+0,         67,         67,        1,    55296, 0x7d272ac3
+0,         68,         68,        1,    55296, 0x37512dcc
+0,         69,         69,        1,    55296, 0x66832c7f
 0,         70,         70,        1,    55296, 0xbc1046fb
 0,         71,         71,        1,    55296, 0xf44d470f
 0,         72,         72,        1,    55296, 0x28d85a11
-0,         73,         73,        1,    55296, 0xa68953b6
-0,         74,         74,        1,    55296, 0x02593ce5
-0,         75,         75,        1,    55296, 0x61be53d5
-0,         76,         76,        1,    55296, 0x4c503c54
-0,         77,         77,        1,    55296, 0x3d3e60f7
-0,         78,         78,        1,    55296, 0xec876b9d
-0,         79,         79,        1,    55296, 0x5b5f59e4
-0,         80,         80,        1,    55296, 0xbd2d5f84
-0,         81,         81,        1,    55296, 0xaa7a6410
-0,         82,         82,        1,    55296, 0xaa196189
-0,         83,         83,        1,    55296, 0x81365cca
-0,         84,         84,        1,    55296, 0xa85f6861
-0,         85,         85,        1,    55296, 0xcb46562e
-0,         86,         86,        1,    55296, 0x1b935862
-0,         87,         87,        1,    55296, 0x80a45a60
-0,         88,         88,        1,    55296, 0x8e8aabba
-0,         89,         89,        1,    55296, 0x38939b53
-0,         90,         90,        1,    55296, 0x4f397c22
-0,         91,         91,        1,    55296, 0x7d0d8476
-0,         92,         92,        1,    55296, 0x943e8044
-0,         93,         93,        1,    55296, 0xabc6b323
-0,         94,         94,        1,    55296, 0x87dfb605
-0,         95,         95,        1,    55296, 0x5ca89202
+0,         73,         73,        1,    55296, 0xbdb153c7
+0,         74,         74,        1,    55296, 0x87093d2d
+0,         75,         75,        1,    55296, 0x132c5459
+0,         76,         76,        1,    55296, 0x293e3cff
+0,         77,         77,        1,    55296, 0x1a2c61a2
+0,         78,         78,        1,    55296, 0xc9756c48
+0,         79,         79,        1,    55296, 0xd90f5a89
+0,         80,         80,        1,    55296, 0x83eb6053
+0,         81,         81,        1,    55296, 0x713864df
+0,         82,         82,        1,    55296, 0xf0ef6273
+0,         83,         83,        1,    55296, 0x24875dc4
+0,         84,         84,        1,    55296, 0x094a696e
+0,         85,         85,        1,    55296, 0xe2d95761
+0,         86,         86,        1,    55296, 0x33265995
+0,         87,         87,        1,    55296, 0xc24b5bb9
+0,         88,         88,        1,    55296, 0xc130ad3d
+0,         89,         89,        1,    55296, 0x42389d02
+0,         90,         90,        1,    55296, 0x372b7dbd
+0,         91,         91,        1,    55296, 0x8645860d
+0,         92,         92,        1,    55296, 0x218581dc
+0,         93,         93,        1,    55296, 0xaea2b4e7
+0,         94,         94,        1,    55296, 0x3b14b7fa
+0,         95,         95,        1,    55296, 0x7b7d93f7
 0,         96,         96,        1,    55296, 0x61bc9b27
 0,         97,         97,        1,    55296, 0x1e4baa30
-0,         98,         98,        1,    55296, 0xd8a7adb0
+0,         98,         98,        1,    55296, 0x2a6dadac
 0,         99,         99,        1,    55296, 0x0d0aa8fb
-0,        100,        100,        1,    55296, 0x1f1ba33c
-0,        101,        101,        1,    55296, 0xa000a80b
-0,        102,        102,        1,    55296, 0xb49dd332
-0,        103,        103,        1,    55296, 0x6b8ac499
-0,        104,        104,        1,    55296, 0x9636ed15
-0,        105,        105,        1,    55296, 0xa152f03d
-0,        106,        106,        1,    55296, 0x47a8cfc7
-0,        107,        107,        1,    55296, 0x9f94c82a
-0,        108,        108,        1,    55296, 0xe208d626
-0,        109,        109,        1,    55296, 0x28cc0616
-0,        110,        110,        1,    55296, 0xc545179e
-0,        111,        111,        1,    55296, 0xd38e05af
-0,        112,        112,        1,    55296, 0x25d6ed99
-0,        113,        113,        1,    55296, 0x7a6bf86e
-0,        114,        114,        1,    55296, 0xbb3bfbcd
-0,        115,        115,        1,    55296, 0x33de2984
-0,        116,        116,        1,    55296, 0xd5b10c27
-0,        117,        117,        1,    55296, 0x19e31f78
-0,        118,        118,        1,    55296, 0xf62f1a4f
-0,        119,        119,        1,    55296, 0x3f792203
-0,        120,        120,        1,    55296, 0xe4ed6202
-0,        121,        121,        1,    55296, 0xee265136
-0,        122,        122,        1,    55296, 0x408af73c
+0,        100,        100,        1,    55296, 0x3c6aa33a
+0,        101,        101,        1,    55296, 0xbd4fa809
+0,        102,        102,        1,    55296, 0x55edd382
+0,        103,        103,        1,    55296, 0x6a9cc4df
+0,        104,        104,        1,    55296, 0x49a5ed7f
+0,        105,        105,        1,    55296, 0x0c33f0b3
+0,        106,        106,        1,    55296, 0xd5e4d037
+0,        107,        107,        1,    55296, 0x2ddfc89a
+0,        108,        108,        1,    55296, 0xb39ed6c6
+0,        109,        109,        1,    55296, 0x8fe606e2
+0,        110,        110,        1,    55296, 0x10ce18ec
+0,        111,        111,        1,    55296, 0xe2110705
+0,        112,        112,        1,    55296, 0x1a00ef28
+0,        113,        113,        1,    55296, 0x9c90fa21
+0,        114,        114,        1,    55296, 0xfafffdbe
+0,        115,        115,        1,    55296, 0x741e2bc8
+0,        116,        116,        1,    55296, 0xf5b00ece
+0,        117,        117,        1,    55296, 0x3b2e224d
+0,        118,        118,        1,    55296, 0x29e81d73
+0,        119,        119,        1,    55296, 0xe3412580
+0,        120,        120,        1,    55296, 0x3c2865dc
+0,        121,        121,        1,    55296, 0xd4b5553b
+0,        122,        122,        1,    55296, 0x1ad8fa27
 0,        123,        123,        1,    55296, 0xc1533ef5
 0,        124,        124,        1,    55296, 0xf671f85d
 0,        125,        125,        1,    55296, 0xae2670e0
diff --git a/tests/ref/fate/vp61 b/tests/ref/fate/vp61
index 2d3beea189..13146c4071 100644
--- a/tests/ref/fate/vp61
+++ b/tests/ref/fate/vp61
@@ -4,122 +4,122 @@
 #dimensions 0: 112x112
 #sar 0: 0/1
 0,          0,          0,        1,    18816, 0xc3fe9fc7
-0,          1,          1,        1,    18816, 0x6ddf972f
-0,          2,          2,        1,    18816, 0x72808b6e
-0,          3,          3,        1,    18816, 0x8f09857f
-0,          4,          4,        1,    18816, 0xe8027c00
-0,          5,          5,        1,    18816, 0x308670cf
-0,          6,          6,        1,    18816, 0x0e656170
-0,          7,          7,        1,    18816, 0x594e54a4
-0,          8,          8,        1,    18816, 0x36944b05
-0,          9,          9,        1,    18816, 0x87013a34
-0,         10,         10,        1,    18816, 0xc0f32f0d
-0,         11,         11,        1,    18816, 0x911f1951
-0,         12,         12,        1,    18816, 0xad590d59
-0,         13,         13,        1,    18816, 0x943afff0
-0,         14,         14,        1,    18816, 0x7f5ef719
-0,         15,         15,        1,    18816, 0x889feafc
-0,         16,         16,        1,    18816, 0x4334e12b
-0,         17,         17,        1,    18816, 0xd080cc67
-0,         18,         18,        1,    18816, 0xc3c1c04c
-0,         19,         19,        1,    18816, 0x816bae4b
-0,         20,         20,        1,    18816, 0xed23a5c7
-0,         21,         21,        1,    18816, 0x86689c2f
-0,         22,         22,        1,    18816, 0x63408c52
-0,         23,         23,        1,    18816, 0x399c79d6
-0,         24,         24,        1,    18816, 0xf0ff63bf
-0,         25,         25,        1,    18816, 0xa6185353
-0,         26,         26,        1,    18816, 0xe33d46fc
-0,         27,         27,        1,    18816, 0xd58d3c6d
-0,         28,         28,        1,    18816, 0xc94a27ea
-0,         29,         29,        1,    18816, 0x62f31c59
-0,         30,         30,        1,    18816, 0x71880825
-0,         31,         31,        1,    18816, 0xa6ce01d7
-0,         32,         32,        1,    18816, 0xa1d4fc06
-0,         33,         33,        1,    18816, 0xc208f570
-0,         34,         34,        1,    18816, 0xc862e637
-0,         35,         35,        1,    18816, 0xcf9ed93a
-0,         36,         36,        1,    18816, 0x85a8cbcc
-0,         37,         37,        1,    18816, 0x650ac6c1
-0,         38,         38,        1,    18816, 0xb418c12b
-0,         39,         39,        1,    18816, 0x9fe5b412
-0,         40,         40,        1,    18816, 0x80f6a7c1
-0,         41,         41,        1,    18816, 0x283299e4
-0,         42,         42,        1,    18816, 0x15429202
-0,         43,         43,        1,    18816, 0x9f0f8c8a
-0,         44,         44,        1,    18816, 0x8e828811
-0,         45,         45,        1,    18816, 0xaac67993
-0,         46,         46,        1,    18816, 0x8f3b6f4f
-0,         47,         47,        1,    18816, 0x0b125f95
-0,         48,         48,        1,    18816, 0xb4e75d14
-0,         49,         49,        1,    18816, 0x1bac5933
-0,         50,         50,        1,    18816, 0x300b521b
-0,         51,         51,        1,    18816, 0x51174590
-0,         52,         52,        1,    18816, 0x03df3d70
-0,         53,         53,        1,    18816, 0x338a344a
-0,         54,         54,        1,    18816, 0x45ad328d
-0,         55,         55,        1,    18816, 0x2d4e321a
-0,         56,         56,        1,    18816, 0x15932563
-0,         57,         57,        1,    18816, 0x9b4f1c76
-0,         58,         58,        1,    18816, 0x8e31153c
-0,         59,         59,        1,    18816, 0xfb391185
-0,         60,         60,        1,    18816, 0x93ee0cdc
-0,         61,         61,        1,    18816, 0xddeb0642
-0,         62,         62,        1,    18816, 0xda6cf529
-0,         63,         63,        1,    18816, 0xdbd6f085
-0,         64,         64,        1,    18816, 0x357aec81
-0,         65,         65,        1,    18816, 0x36eaecca
-0,         66,         66,        1,    18816, 0x6535ee02
-0,         67,         67,        1,    18816, 0xb7dfe466
-0,         68,         68,        1,    18816, 0x58d3d86b
-0,         69,         69,        1,    18816, 0xd8aad64b
-0,         70,         70,        1,    18816, 0x37ecd588
-0,         71,         71,        1,    18816, 0xe2f9cee4
-0,         72,         72,        1,    18816, 0xcd1ac93e
-0,         73,         73,        1,    18816, 0x18e1be81
-0,         74,         74,        1,    18816, 0xa05bb9d7
-0,         75,         75,        1,    18816, 0xe0ebb663
-0,         76,         76,        1,    18816, 0x7d61b39a
-0,         77,         77,        1,    18816, 0x01b8acb5
-0,         78,         78,        1,    18816, 0x7577aa8b
-0,         79,         79,        1,    18816, 0x6bbda4b5
-0,         80,         80,        1,    18816, 0xd0cc9b29
-0,         81,         81,        1,    18816, 0xb2858cbb
-0,         82,         82,        1,    18816, 0x93608c9d
-0,         83,         83,        1,    18816, 0x80c38e03
-0,         84,         84,        1,    18816, 0x37d6843c
-0,         85,         85,        1,    18816, 0xacc47b9a
-0,         86,         86,        1,    18816, 0xc4317178
-0,         87,         87,        1,    18816, 0xc92f6ebd
-0,         88,         88,        1,    18816, 0xc1217a3b
-0,         89,         89,        1,    18816, 0x03a37ccb
-0,         90,         90,        1,    18816, 0xf38c71a2
-0,         91,         91,        1,    18816, 0x68ff697d
-0,         92,         92,        1,    18816, 0x0fe358e5
-0,         93,         93,        1,    18816, 0x58455870
-0,         94,         94,        1,    18816, 0xc9075ce7
-0,         95,         95,        1,    18816, 0x16685773
-0,         96,         96,        1,    18816, 0x1b434c0e
-0,         97,         97,        1,    18816, 0x008e4c97
-0,         98,         98,        1,    18816, 0xb4d04f4f
-0,         99,         99,        1,    18816, 0xc8c94848
-0,        100,        100,        1,    18816, 0x64664191
-0,        101,        101,        1,    18816, 0xd591367f
-0,        102,        102,        1,    18816, 0xc70d3141
-0,        103,        103,        1,    18816, 0x8d492655
-0,        104,        104,        1,    18816, 0x7e7f22c8
-0,        105,        105,        1,    18816, 0x335d23f9
-0,        106,        106,        1,    18816, 0x0a7f22b6
-0,        107,        107,        1,    18816, 0x6cf51cb2
-0,        108,        108,        1,    18816, 0x312516e1
-0,        109,        109,        1,    18816, 0x8a3c0c7a
-0,        110,        110,        1,    18816, 0x997d0d20
-0,        111,        111,        1,    18816, 0xffbd117e
-0,        112,        112,        1,    18816, 0x855808ca
-0,        113,        113,        1,    18816, 0xe335fb94
-0,        114,        114,        1,    18816, 0x12e6f95c
-0,        115,        115,        1,    18816, 0x2d62f845
-0,        116,        116,        1,    18816, 0x7e63f591
-0,        117,        117,        1,    18816, 0x7463f175
-0,        118,        118,        1,    18816, 0x1521e0d2
-0,        119,        119,        1,    18816, 0x96a8dbce
+0,          1,          1,        1,    18816, 0xab429744
+0,          2,          2,        1,    18816, 0x1eec8b7d
+0,          3,          3,        1,    18816, 0x3817859f
+0,          4,          4,        1,    18816, 0x8f487c41
+0,          5,          5,        1,    18816, 0x4ce87138
+0,          6,          6,        1,    18816, 0x499361dd
+0,          7,          7,        1,    18816, 0xd26c5518
+0,          8,          8,        1,    18816, 0xfb1a4b88
+0,          9,          9,        1,    18816, 0x4ac63ac7
+0,         10,         10,        1,    18816, 0x39642fad
+0,         11,         11,        1,    18816, 0x4dd219f6
+0,         12,         12,        1,    18816, 0x6c500df7
+0,         13,         13,        1,    18816, 0x700e00b4
+0,         14,         14,        1,    18816, 0xbebaf7e0
+0,         15,         15,        1,    18816, 0x22c1ebf6
+0,         16,         16,        1,    18816, 0x723fe229
+0,         17,         17,        1,    18816, 0x9b22cd91
+0,         18,         18,        1,    18816, 0x45ddc17a
+0,         19,         19,        1,    18816, 0x9b33af88
+0,         20,         20,        1,    18816, 0xf9d1a70d
+0,         21,         21,        1,    18816, 0x9bfd9d84
+0,         22,         22,        1,    18816, 0x27048da1
+0,         23,         23,        1,    18816, 0x0e497b2d
+0,         24,         24,        1,    18816, 0x508264fd
+0,         25,         25,        1,    18816, 0xf6985495
+0,         26,         26,        1,    18816, 0xa5014869
+0,         27,         27,        1,    18816, 0x426e3de4
+0,         28,         28,        1,    18816, 0xd72129b9
+0,         29,         29,        1,    18816, 0x12e51e1c
+0,         30,         30,        1,    18816, 0x754109eb
+0,         31,         31,        1,    18816, 0x2fb5039e
+0,         32,         32,        1,    18816, 0x9407fdea
+0,         33,         33,        1,    18816, 0x59f2f752
+0,         34,         34,        1,    18816, 0xb448e831
+0,         35,         35,        1,    18816, 0xf31fdb2e
+0,         36,         36,        1,    18816, 0x6bedcdec
+0,         37,         37,        1,    18816, 0xbbfec8e6
+0,         38,         38,        1,    18816, 0x104ac345
+0,         39,         39,        1,    18816, 0xd387b629
+0,         40,         40,        1,    18816, 0x4187a9e7
+0,         41,         41,        1,    18816, 0x1c649c17
+0,         42,         42,        1,    18816, 0xcc869431
+0,         43,         43,        1,    18816, 0x8bc78ed1
+0,         44,         44,        1,    18816, 0x34de8a5f
+0,         45,         45,        1,    18816, 0x42727bd0
+0,         46,         46,        1,    18816, 0x6e9c7192
+0,         47,         47,        1,    18816, 0xd93761c1
+0,         48,         48,        1,    18816, 0x69455f50
+0,         49,         49,        1,    18816, 0xa35d5b8b
+0,         50,         50,        1,    18816, 0xe6635469
+0,         51,         51,        1,    18816, 0x285d47f9
+0,         52,         52,        1,    18816, 0xdb0a3fdf
+0,         53,         53,        1,    18816, 0x608336d0
+0,         54,         54,        1,    18816, 0x39e9353f
+0,         55,         55,        1,    18816, 0xad2034bd
+0,         56,         56,        1,    18816, 0xa0f527e7
+0,         57,         57,        1,    18816, 0x5ed71ef1
+0,         58,         58,        1,    18816, 0xd2df1798
+0,         59,         59,        1,    18816, 0x932513d3
+0,         60,         60,        1,    18816, 0xab600f1b
+0,         61,         61,        1,    18816, 0x665d087e
+0,         62,         62,        1,    18816, 0x8d71f765
+0,         63,         63,        1,    18816, 0xfc80f2ae
+0,         64,         64,        1,    18816, 0x885bee81
+0,         65,         65,        1,    18816, 0x6c4feec9
+0,         66,         66,        1,    18816, 0x5010f017
+0,         67,         67,        1,    18816, 0x63d5e683
+0,         68,         68,        1,    18816, 0x216ddab5
+0,         69,         69,        1,    18816, 0xb758d8c2
+0,         70,         70,        1,    18816, 0xeae4d7e5
+0,         71,         71,        1,    18816, 0x2553d137
+0,         72,         72,        1,    18816, 0xced6cb97
+0,         73,         73,        1,    18816, 0xd332c103
+0,         74,         74,        1,    18816, 0xe84bbc67
+0,         75,         75,        1,    18816, 0x21f7b90d
+0,         76,         76,        1,    18816, 0xbd88b648
+0,         77,         77,        1,    18816, 0xe7b8af59
+0,         78,         78,        1,    18816, 0x30f5ad3d
+0,         79,         79,        1,    18816, 0x79bfa7bb
+0,         80,         80,        1,    18816, 0xd5919e34
+0,         81,         81,        1,    18816, 0x43758fda
+0,         82,         82,        1,    18816, 0x93ff8fcc
+0,         83,         83,        1,    18816, 0xa444913f
+0,         84,         84,        1,    18816, 0xc41d878b
+0,         85,         85,        1,    18816, 0x526d7f09
+0,         86,         86,        1,    18816, 0x40307528
+0,         87,         87,        1,    18816, 0xf63d725c
+0,         88,         88,        1,    18816, 0x45587ddb
+0,         89,         89,        1,    18816, 0x37018069
+0,         90,         90,        1,    18816, 0x69567572
+0,         91,         91,        1,    18816, 0xa8086d54
+0,         92,         92,        1,    18816, 0x2ab65ccc
+0,         93,         93,        1,    18816, 0xa5475c5d
+0,         94,         94,        1,    18816, 0x87dc60e2
+0,         95,         95,        1,    18816, 0x54295b5d
+0,         96,         96,        1,    18816, 0xce424fe9
+0,         97,         97,        1,    18816, 0x99e0506d
+0,         98,         98,        1,    18816, 0x6ac55324
+0,         99,         99,        1,    18816, 0xa60f4c1a
+0,        100,        100,        1,    18816, 0x7eba456e
+0,        101,        101,        1,    18816, 0xab703a88
+0,        102,        102,        1,    18816, 0xb8263539
+0,        103,        103,        1,    18816, 0x829e2abb
+0,        104,        104,        1,    18816, 0x2e9f2736
+0,        105,        105,        1,    18816, 0x7a3d2885
+0,        106,        106,        1,    18816, 0x8023274f
+0,        107,        107,        1,    18816, 0x39bf2196
+0,        108,        108,        1,    18816, 0x21cf1bcb
+0,        109,        109,        1,    18816, 0x016911b9
+0,        110,        110,        1,    18816, 0x2a791237
+0,        111,        111,        1,    18816, 0x093f16a7
+0,        112,        112,        1,    18816, 0x07a90df3
+0,        113,        113,        1,    18816, 0x8de800ca
+0,        114,        114,        1,    18816, 0xe379fe68
+0,        115,        115,        1,    18816, 0x267afd69
+0,        116,        116,        1,    18816, 0x5b29fac1
+0,        117,        117,        1,    18816, 0x3606f6b6
+0,        118,        118,        1,    18816, 0xcbdce61e
+0,        119,        119,        1,    18816, 0x28ffe113
diff --git a/tests/ref/fate/vp6a b/tests/ref/fate/vp6a
index b4f33630f7..8fb2630ff3 100644
--- a/tests/ref/fate/vp6a
+++ b/tests/ref/fate/vp6a
@@ -4,95 +4,95 @@
 #dimensions 0: 300x180
 #sar 0: 0/1
 0,          0,          0,        1,   135000, 0x9dceed6d
-0,          1,          1,        1,   135000, 0x47e5778d
-0,          2,          2,        1,   135000, 0x5de36599
-0,          3,          3,        1,   135000, 0x540d8079
-0,          4,          4,        1,   135000, 0xba9ea534
-0,          5,          5,        1,   135000, 0xa75088f8
-0,          6,          6,        1,   135000, 0x7d867559
-0,          7,          7,        1,   135000, 0xcc678fee
-0,          8,          8,        1,   135000, 0x79c590b9
-0,          9,          9,        1,   135000, 0x87789918
-0,         10,         10,        1,   135000, 0xaa939213
-0,         11,         11,        1,   135000, 0x3912916d
-0,         12,         12,        1,   135000, 0x41305d0b
-0,         13,         13,        1,   135000, 0x2686b5dd
-0,         14,         14,        1,   135000, 0xa69ae422
-0,         15,         15,        1,   135000, 0x998a3478
-0,         16,         16,        1,   135000, 0x5842768d
-0,         17,         17,        1,   135000, 0xf6a85b16
-0,         18,         18,        1,   135000, 0x7a5b2708
-0,         19,         19,        1,   135000, 0x8b2abb63
-0,         20,         20,        1,   135000, 0x7dc8468b
-0,         21,         21,        1,   135000, 0x04d85001
-0,         22,         22,        1,   135000, 0x83e3c647
-0,         23,         23,        1,   135000, 0xcddd687e
-0,         24,         24,        1,   135000, 0x818e785e
-0,         25,         25,        1,   135000, 0x3a915080
-0,         26,         26,        1,   135000, 0x953d603d
-0,         27,         27,        1,   135000, 0x79005ebf
-0,         28,         28,        1,   135000, 0x80afec75
-0,         29,         29,        1,   135000, 0xfc8e376b
-0,         30,         30,        1,   135000, 0xf957b7ef
-0,         31,         31,        1,   135000, 0xe878da44
-0,         32,         32,        1,   135000, 0xe68ecca3
-0,         33,         33,        1,   135000, 0x1a2cc7d3
-0,         34,         34,        1,   135000, 0x4f346a69
-0,         35,         35,        1,   135000, 0x7a0cf4ac
-0,         36,         36,        1,   135000, 0x6d4eee7a
-0,         37,         37,        1,   135000, 0xf0688cbd
-0,         38,         38,        1,   135000, 0xca4abbbc
-0,         39,         39,        1,   135000, 0x87669519
-0,         40,         40,        1,   135000, 0xd090e9d7
-0,         41,         41,        1,   135000, 0xd7f536c1
-0,         42,         42,        1,   135000, 0x353ede54
-0,         43,         43,        1,   135000, 0xbc8f5358
-0,         44,         44,        1,   135000, 0xb52cd59a
-0,         45,         45,        1,   135000, 0x0b882eba
-0,         46,         46,        1,   135000, 0xc544cd54
-0,         47,         47,        1,   135000, 0x31ca7e73
+0,          1,          1,        1,   135000, 0x1fc377a4
+0,          2,          2,        1,   135000, 0x0b4465d4
+0,          3,          3,        1,   135000, 0x136b8062
+0,          4,          4,        1,   135000, 0x4691a55c
+0,          5,          5,        1,   135000, 0x55bb8a19
+0,          6,          6,        1,   135000, 0xdbf67651
+0,          7,          7,        1,   135000, 0x6fb19113
+0,          8,          8,        1,   135000, 0x3edc9227
+0,          9,          9,        1,   135000, 0x53b39aff
+0,         10,         10,        1,   135000, 0x699e94b0
+0,         11,         11,        1,   135000, 0xeedd9388
+0,         12,         12,        1,   135000, 0x14055f96
+0,         13,         13,        1,   135000, 0x71fbb5fd
+0,         14,         14,        1,   135000, 0x6fb4e491
+0,         15,         15,        1,   135000, 0x35ca3482
+0,         16,         16,        1,   135000, 0x0c2a7530
+0,         17,         17,        1,   135000, 0x422c5581
+0,         18,         18,        1,   135000, 0x19eb2155
+0,         19,         19,        1,   135000, 0x07e1b114
+0,         20,         20,        1,   135000, 0xa10f3f81
+0,         21,         21,        1,   135000, 0x75684dcd
+0,         22,         22,        1,   135000, 0x1721c337
+0,         23,         23,        1,   135000, 0x3897667d
+0,         24,         24,        1,   135000, 0x1232769e
+0,         25,         25,        1,   135000, 0xec975059
+0,         26,         26,        1,   135000, 0xb2a46123
+0,         27,         27,        1,   135000, 0x052c5f72
+0,         28,         28,        1,   135000, 0x3087eb2f
+0,         29,         29,        1,   135000, 0xd1e0373a
+0,         30,         30,        1,   135000, 0x64dab704
+0,         31,         31,        1,   135000, 0xa44dd89e
+0,         32,         32,        1,   135000, 0x380ecae9
+0,         33,         33,        1,   135000, 0x8c6fc4ab
+0,         34,         34,        1,   135000, 0x02096903
+0,         35,         35,        1,   135000, 0x11edf432
+0,         36,         36,        1,   135000, 0x3585ee5f
+0,         37,         37,        1,   135000, 0xe1338c40
+0,         38,         38,        1,   135000, 0x5edfbd0c
+0,         39,         39,        1,   135000, 0x9420965c
+0,         40,         40,        1,   135000, 0x0caceb17
+0,         41,         41,        1,   135000, 0x3fdc36c3
+0,         42,         42,        1,   135000, 0x8a24df14
+0,         43,         43,        1,   135000, 0x5dc057b0
+0,         44,         44,        1,   135000, 0xdc5eda65
+0,         45,         45,        1,   135000, 0x60433612
+0,         46,         46,        1,   135000, 0x6a91d6c9
+0,         47,         47,        1,   135000, 0x53598734
 0,         48,         48,        1,   135000, 0xb1569ce9
-0,         49,         49,        1,   135000, 0x8bf4394f
-0,         50,         50,        1,   135000, 0xf413812a
-0,         51,         51,        1,   135000, 0xf2fa90ab
-0,         52,         52,        1,   135000, 0xdcd8b265
-0,         53,         53,        1,   135000, 0xa89cdba1
-0,         54,         54,        1,   135000, 0x212b59a5
-0,         55,         55,        1,   135000, 0x10c589c3
-0,         56,         56,        1,   135000, 0x432ab5b4
+0,         49,         49,        1,   135000, 0xf5e83a33
+0,         50,         50,        1,   135000, 0xebe18275
+0,         51,         51,        1,   135000, 0x98af9447
+0,         52,         52,        1,   135000, 0x3f03b765
+0,         53,         53,        1,   135000, 0x7423e0b8
+0,         54,         54,        1,   135000, 0x6c1b5faa
+0,         55,         55,        1,   135000, 0xebf98d52
+0,         56,         56,        1,   135000, 0xf3dfb8b6
 0,         57,         57,        1,   135000, 0x85a9634a
-0,         58,         58,        1,   135000, 0x10db5b87
-0,         59,         59,        1,   135000, 0x583145d9
-0,         60,         60,        1,   135000, 0x7d3a33bd
-0,         61,         61,        1,   135000, 0xcf592423
-0,         62,         62,        1,   135000, 0xb59728e5
-0,         63,         63,        1,   135000, 0x1eeca660
-0,         64,         64,        1,   135000, 0xff7bcc34
-0,         65,         65,        1,   135000, 0x0ef8f271
-0,         66,         66,        1,   135000, 0x8c9ca8ee
-0,         67,         67,        1,   135000, 0x8a7ece34
-0,         68,         68,        1,   135000, 0x7d4c3b5d
-0,         69,         69,        1,   135000, 0x99118f21
-0,         70,         70,        1,   135000, 0xd97fe7e2
-0,         71,         71,        1,   135000, 0xf93842f1
-0,         72,         72,        1,   135000, 0x35c912e8
-0,         73,         73,        1,   135000, 0x14e59e97
+0,         58,         58,        1,   135000, 0x4d425bb5
+0,         59,         59,        1,   135000, 0xfb7945ee
+0,         60,         60,        1,   135000, 0x593534c1
+0,         61,         61,        1,   135000, 0xe3fa2517
+0,         62,         62,        1,   135000, 0x893629e3
+0,         63,         63,        1,   135000, 0xdc3ca6ad
+0,         64,         64,        1,   135000, 0x16b1ce27
+0,         65,         65,        1,   135000, 0x8296f478
+0,         66,         66,        1,   135000, 0x9e9baaa3
+0,         67,         67,        1,   135000, 0x994ecd4a
+0,         68,         68,        1,   135000, 0x40f83b3c
+0,         69,         69,        1,   135000, 0x0de38f90
+0,         70,         70,        1,   135000, 0x5455ea6c
+0,         71,         71,        1,   135000, 0x053e41e8
+0,         72,         72,        1,   135000, 0x0fee1281
+0,         73,         73,        1,   135000, 0xa0c9a434
 0,         74,         74,        1,   135000, 0x8e4c19aa
-0,         75,         75,        1,   135000, 0x4adfbc53
-0,         76,         76,        1,   135000, 0x0613adde
-0,         77,         77,        1,   135000, 0x8db264ab
-0,         78,         78,        1,   135000, 0x3948b619
-0,         79,         79,        1,   135000, 0x843d7c02
-0,         80,         80,        1,   135000, 0x534fea34
+0,         75,         75,        1,   135000, 0x34bebc00
+0,         76,         76,        1,   135000, 0x6670ad6f
+0,         77,         77,        1,   135000, 0xdbba63fc
+0,         78,         78,        1,   135000, 0xe34fb839
+0,         79,         79,        1,   135000, 0xa3ce7eb1
+0,         80,         80,        1,   135000, 0xdec7ed7d
 0,         81,         81,        1,   135000, 0xdb7041bf
-0,         82,         82,        1,   135000, 0xd0ce1cce
-0,         83,         83,        1,   135000, 0x3c008335
-0,         84,         84,        1,   135000, 0xb699208f
-0,         85,         85,        1,   135000, 0xe07da3ca
-0,         86,         86,        1,   135000, 0x26331f41
-0,         87,         87,        1,   135000, 0x4e19fe83
-0,         88,         88,        1,   135000, 0xaa9a9e45
-0,         89,         89,        1,   135000, 0x336b7ed0
-0,         90,         90,        1,   135000, 0xc9bf7611
+0,         82,         82,        1,   135000, 0x2b1d1dc1
+0,         83,         83,        1,   135000, 0xaaa384c1
+0,         84,         84,        1,   135000, 0x37f42217
+0,         85,         85,        1,   135000, 0x928ba4da
+0,         86,         86,        1,   135000, 0x2b681f41
+0,         87,         87,        1,   135000, 0xcbe1ff84
+0,         88,         88,        1,   135000, 0x47949f24
+0,         89,         89,        1,   135000, 0x368b7fe5
+0,         90,         90,        1,   135000, 0x1cf4773b
 0,         91,         91,        1,   135000, 0x14c33a35
 0,         92,         92,        1,   135000, 0xdc08470e
diff --git a/tests/ref/fate/vp6a-skip_alpha b/tests/ref/fate/vp6a-skip_alpha
index e2c435f402..f092778021 100644
--- a/tests/ref/fate/vp6a-skip_alpha
+++ b/tests/ref/fate/vp6a-skip_alpha
@@ -4,95 +4,95 @@
 #dimensions 0: 300x180
 #sar 0: 0/1
 0,          0,          0,        1,    81000, 0xcb92962d
-0,          1,          1,        1,    81000, 0xae381904
-0,          2,          2,        1,    81000, 0x1fcc0c75
-0,          3,          3,        1,    81000, 0x023f0c21
-0,          4,          4,        1,    81000, 0xad691402
-0,          5,          5,        1,    81000, 0x42390be0
-0,          6,          6,        1,    81000, 0xc1c10a4e
-0,          7,          7,        1,    81000, 0x9c0315ac
-0,          8,          8,        1,    81000, 0xc2a315a7
-0,          9,          9,        1,    81000, 0x3a631392
-0,         10,         10,        1,    81000, 0x11591414
-0,         11,         11,        1,    81000, 0x1a551125
-0,         12,         12,        1,    81000, 0x2e1efa4f
-0,         13,         13,        1,    81000, 0x4aa3f016
-0,         14,         14,        1,    81000, 0x74c029d8
-0,         15,         15,        1,    81000, 0xdee9a98b
-0,         16,         16,        1,    81000, 0xdf3502d5
-0,         17,         17,        1,    81000, 0x4653536b
-0,         18,         18,        1,    81000, 0x7f658c75
-0,         19,         19,        1,    81000, 0xab18ff13
-0,         20,         20,        1,    81000, 0xac2b8f3b
-0,         21,         21,        1,    81000, 0xd61ff094
-0,         22,         22,        1,    81000, 0x425bfc2b
-0,         23,         23,        1,    81000, 0x6be7ecd3
-0,         24,         24,        1,    81000, 0x0b0ee65b
-0,         25,         25,        1,    81000, 0x3c6f146b
-0,         26,         26,        1,    81000, 0x27c4e9c8
-0,         27,         27,        1,    81000, 0x174022c4
-0,         28,         28,        1,    81000, 0x3320fe81
-0,         29,         29,        1,    81000, 0x7a3c342e
-0,         30,         30,        1,    81000, 0x448b4346
-0,         31,         31,        1,    81000, 0xd285b23d
-0,         32,         32,        1,    81000, 0x852ed590
-0,         33,         33,        1,    81000, 0xc9d3df17
-0,         34,         34,        1,    81000, 0x4d23727b
-0,         35,         35,        1,    81000, 0x1fae66cd
-0,         36,         36,        1,    81000, 0x384d54ab
-0,         37,         37,        1,    81000, 0x2fee6ba3
-0,         38,         38,        1,    81000, 0xd7ad6f59
-0,         39,         39,        1,    81000, 0xaf5e3e76
-0,         40,         40,        1,    81000, 0x10fceda4
-0,         41,         41,        1,    81000, 0xb26df92b
-0,         42,         42,        1,    81000, 0xd6676e08
-0,         43,         43,        1,    81000, 0xff6b1b95
-0,         44,         44,        1,    81000, 0x6196d598
-0,         45,         45,        1,    81000, 0x833ebf1b
-0,         46,         46,        1,    81000, 0x7b085af1
-0,         47,         47,        1,    81000, 0xe8f583b4
+0,          1,          1,        1,    81000, 0x8fef1925
+0,          2,          2,        1,    81000, 0xf0350cb6
+0,          3,          3,        1,    81000, 0xa70a0c52
+0,          4,          4,        1,    81000, 0x21ef1490
+0,          5,          5,        1,    81000, 0x98bc0c96
+0,          6,          6,        1,    81000, 0x92380b27
+0,          7,          7,        1,    81000, 0xbba216cd
+0,          8,          8,        1,    81000, 0x92a8172b
+0,          9,          9,        1,    81000, 0xfbc21592
+0,         10,         10,        1,    81000, 0xdad416a1
+0,         11,         11,        1,    81000, 0xec4d13aa
+0,         12,         12,        1,    81000, 0xaf36fcff
+0,         13,         13,        1,    81000, 0xb4fcf056
+0,         14,         14,        1,    81000, 0xe3782a3f
+0,         15,         15,        1,    81000, 0x714daa0b
+0,         16,         16,        1,    81000, 0xe2770382
+0,         17,         17,        1,    81000, 0x553253ff
+0,         18,         18,        1,    81000, 0x928d8c46
+0,         19,         19,        1,    81000, 0x06c8fe82
+0,         20,         20,        1,    81000, 0xb8198f5a
+0,         21,         21,        1,    81000, 0x0029f118
+0,         22,         22,        1,    81000, 0x6fe7fc6f
+0,         23,         23,        1,    81000, 0x9165edde
+0,         24,         24,        1,    81000, 0xe76ae791
+0,         25,         25,        1,    81000, 0xa4dd145a
+0,         26,         26,        1,    81000, 0x2d7de9d8
+0,         27,         27,        1,    81000, 0xe102228b
+0,         28,         28,        1,    81000, 0xc57ffe0e
+0,         29,         29,        1,    81000, 0x324434cb
+0,         30,         30,        1,    81000, 0xedc0433e
+0,         31,         31,        1,    81000, 0xd42bb18a
+0,         32,         32,        1,    81000, 0xedb3d561
+0,         33,         33,        1,    81000, 0x5244de92
+0,         34,         34,        1,    81000, 0x0bb27280
+0,         35,         35,        1,    81000, 0xc6116736
+0,         36,         36,        1,    81000, 0x42f154e2
+0,         37,         37,        1,    81000, 0xffbd6bf9
+0,         38,         38,        1,    81000, 0x813170d0
+0,         39,         39,        1,    81000, 0x430c4040
+0,         40,         40,        1,    81000, 0x56d1eecb
+0,         41,         41,        1,    81000, 0xaa4afa12
+0,         42,         42,        1,    81000, 0x2c3d6fb8
+0,         43,         43,        1,    81000, 0xfedf1e3e
+0,         44,         44,        1,    81000, 0xf538d893
+0,         45,         45,        1,    81000, 0xcc81c3b5
+0,         46,         46,        1,    81000, 0x59b95fbc
+0,         47,         47,        1,    81000, 0xb4da87a0
 0,         48,         48,        1,    81000, 0x3426d5e4
-0,         49,         49,        1,    81000, 0x214069ed
-0,         50,         50,        1,    81000, 0x7dbdfd3f
-0,         51,         51,        1,    81000, 0xf19b3f45
-0,         52,         52,        1,    81000, 0x0f05c7e2
-0,         53,         53,        1,    81000, 0xba94e323
-0,         54,         54,        1,    81000, 0x0de7b0c2
-0,         55,         55,        1,    81000, 0xfcf93c55
-0,         56,         56,        1,    81000, 0x8a8dbd55
+0,         49,         49,        1,    81000, 0x8d066aae
+0,         50,         50,        1,    81000, 0x09effe79
+0,         51,         51,        1,    81000, 0xecc540ae
+0,         52,         52,        1,    81000, 0x845dc90c
+0,         53,         53,        1,    81000, 0x9c2fe4d2
+0,         54,         54,        1,    81000, 0x8887b277
+0,         55,         55,        1,    81000, 0x3bdc3ca9
+0,         56,         56,        1,    81000, 0x094fbe27
 0,         57,         57,        1,    81000, 0xddf22b97
-0,         58,         58,        1,    81000, 0x49a830ff
-0,         59,         59,        1,    81000, 0x82ab2a4b
-0,         60,         60,        1,    81000, 0xd23420e5
-0,         61,         61,        1,    81000, 0x7c1017d1
-0,         62,         62,        1,    81000, 0x9aa61b38
-0,         63,         63,        1,    81000, 0x2a724a18
-0,         64,         64,        1,    81000, 0xc18055f2
-0,         65,         65,        1,    81000, 0xecba3855
-0,         66,         66,        1,    81000, 0x0eed6b0f
-0,         67,         67,        1,    81000, 0x4be73816
-0,         68,         68,        1,    81000, 0xa681214e
-0,         69,         69,        1,    81000, 0x4958f83d
-0,         70,         70,        1,    81000, 0xca0f0d61
-0,         71,         71,        1,    81000, 0x3c453de1
-0,         72,         72,        1,    81000, 0xff60360a
-0,         73,         73,        1,    81000, 0xdcef0949
+0,         58,         58,        1,    81000, 0x31b23156
+0,         59,         59,        1,    81000, 0xf5bf2ad8
+0,         60,         60,        1,    81000, 0x4a9321c4
+0,         61,         61,        1,    81000, 0xdd1b18ca
+0,         62,         62,        1,    81000, 0x4ece1cdd
+0,         63,         63,        1,    81000, 0x6a9a4b53
+0,         64,         64,        1,    81000, 0x6624578b
+0,         65,         65,        1,    81000, 0x89273a0f
+0,         66,         66,        1,    81000, 0x9eb56c4c
+0,         67,         67,        1,    81000, 0xe60238f5
+0,         68,         68,        1,    81000, 0xbc4c228a
+0,         69,         69,        1,    81000, 0x3feefa08
+0,         70,         70,        1,    81000, 0x0d620f37
+0,         71,         71,        1,    81000, 0x93693fc8
+0,         72,         72,        1,    81000, 0xfc4b3848
+0,         73,         73,        1,    81000, 0xd9950bfb
 0,         74,         74,        1,    81000, 0xe5e3732d
-0,         75,         75,        1,    81000, 0x39747fd4
-0,         76,         76,        1,    81000, 0x6bec70e6
-0,         77,         77,        1,    81000, 0x7026a8c0
-0,         78,         78,        1,    81000, 0x92de5b61
-0,         79,         79,        1,    81000, 0x3f00507f
-0,         80,         80,        1,    81000, 0x5620c377
+0,         75,         75,        1,    81000, 0x53517fd2
+0,         76,         76,        1,    81000, 0xb57c70b0
+0,         77,         77,        1,    81000, 0x378ea87c
+0,         78,         78,        1,    81000, 0xfd2b5b58
+0,         79,         79,        1,    81000, 0x66d45077
+0,         80,         80,        1,    81000, 0x6e07c3f8
 0,         81,         81,        1,    81000, 0x39f5ed38
-0,         82,         82,        1,    81000, 0x6ee35d67
-0,         83,         83,        1,    81000, 0x4f99a409
-0,         84,         84,        1,    81000, 0x0a05b6ea
-0,         85,         85,        1,    81000, 0xd6c442d9
-0,         86,         86,        1,    81000, 0x0bb3d2f0
-0,         87,         87,        1,    81000, 0x6891c5b1
-0,         88,         88,        1,    81000, 0xf16ba9be
-0,         89,         89,        1,    81000, 0xba53528e
-0,         90,         90,        1,    81000, 0xc847de49
+0,         82,         82,        1,    81000, 0x55b05da7
+0,         83,         83,        1,    81000, 0x7f78a42c
+0,         84,         84,        1,    81000, 0x5139b79c
+0,         85,         85,        1,    81000, 0x4054437d
+0,         86,         86,        1,    81000, 0x0f9dd327
+0,         87,         87,        1,    81000, 0xa885c60e
+0,         88,         88,        1,    81000, 0x37abaa72
+0,         89,         89,        1,    81000, 0xdab25345
+0,         90,         90,        1,    81000, 0xbdf4df9d
 0,         91,         91,        1,    81000, 0xc5b2e2b0
 0,         92,         92,        1,    81000, 0xb0b497ff
diff --git a/tests/ref/fate/vp6f b/tests/ref/fate/vp6f
index 65e113174a..c76e077cbf 100644
--- a/tests/ref/fate/vp6f
+++ b/tests/ref/fate/vp6f
@@ -4,176 +4,176 @@
 #dimensions 0: 112x80
 #sar 0: 0/1
 0,          0,          0,        1,    13440, 0x7cb0a22f
-0,          1,          1,        1,    13440, 0xdfcea6ba
-0,          2,          2,        1,    13440, 0x59b2a5da
-0,          3,          3,        1,    13440, 0x12f1b2d8
-0,          4,          4,        1,    13440, 0x280fb9f6
-0,          5,          5,        1,    13440, 0x7bace8b3
-0,          6,          6,        1,    13440, 0x4ec91480
-0,          7,          7,        1,    13440, 0xa8010450
-0,          8,          8,        1,    13440, 0x61d8fc46
-0,          9,          9,        1,    13440, 0x242bb24e
-0,         10,         10,        1,    13440, 0x88397a36
-0,         11,         11,        1,    13440, 0x10e15726
-0,         12,         12,        1,    13440, 0x3018438c
-0,         13,         13,        1,    13440, 0xbbb94c21
-0,         14,         14,        1,    13440, 0xfc3e5e2b
-0,         15,         15,        1,    13440, 0xeaa69354
-0,         16,         16,        1,    13440, 0x96f1cc01
-0,         17,         17,        1,    13440, 0x333fdaff
-0,         18,         18,        1,    13440, 0xb5230ed2
-0,         19,         19,        1,    13440, 0x59383446
-0,         20,         20,        1,    13440, 0x954939e6
-0,         21,         21,        1,    13440, 0x53813d2f
-0,         22,         22,        1,    13440, 0x3ca53600
-0,         23,         23,        1,    13440, 0x7b30227a
-0,         24,         24,        1,    13440, 0x5145bbfe
-0,         25,         25,        1,    13440, 0xa0979632
-0,         26,         26,        1,    13440, 0x08026e21
-0,         27,         27,        1,    13440, 0x3f456d1e
-0,         28,         28,        1,    13440, 0x7d036b62
-0,         29,         29,        1,    13440, 0x508085fb
-0,         30,         30,        1,    13440, 0x251dc193
-0,         31,         31,        1,    13440, 0xf3121c9b
-0,         32,         32,        1,    13440, 0xf5da772e
-0,         33,         33,        1,    13440, 0x8179ccf7
-0,         34,         34,        1,    13440, 0xd57ceeb3
-0,         35,         35,        1,    13440, 0xc8f2169c
-0,         36,         36,        1,    13440, 0xbf8296c3
-0,         37,         37,        1,    13440, 0xee1927d0
-0,         38,         38,        1,    13440, 0xdd84e8d1
-0,         39,         39,        1,    13440, 0x7be57be2
-0,         40,         40,        1,    13440, 0xae353f91
-0,         41,         41,        1,    13440, 0x3ae927f2
-0,         42,         42,        1,    13440, 0x417227c6
-0,         43,         43,        1,    13440, 0x32572bea
-0,         44,         44,        1,    13440, 0x8b9e4839
-0,         45,         45,        1,    13440, 0xad669441
-0,         46,         46,        1,    13440, 0xc9de99a6
-0,         47,         47,        1,    13440, 0xb3ffb88b
-0,         48,         48,        1,    13440, 0xb321b8a0
-0,         49,         49,        1,    13440, 0x2efdbf53
-0,         50,         50,        1,    13440, 0x9b7aa566
-0,         51,         51,        1,    13440, 0x563c8d60
-0,         52,         52,        1,    13440, 0xe3848ee8
-0,         53,         53,        1,    13440, 0xa84b8f1d
-0,         54,         54,        1,    13440, 0x52da9f9f
-0,         55,         55,        1,    13440, 0x2ed56d97
-0,         56,         56,        1,    13440, 0x4e8534c2
-0,         57,         57,        1,    13440, 0x318900a6
-0,         58,         58,        1,    13440, 0xda96de39
-0,         59,         59,        1,    13440, 0xaae7ac0b
+0,          1,          1,        1,    13440, 0xe38fa6b7
+0,          2,          2,        1,    13440, 0xe003a5c6
+0,          3,          3,        1,    13440, 0xe502b2f6
+0,          4,          4,        1,    13440, 0xb731ba56
+0,          5,          5,        1,    13440, 0x8168e8f5
+0,          6,          6,        1,    13440, 0x776d14fb
+0,          7,          7,        1,    13440, 0xb5d0049c
+0,          8,          8,        1,    13440, 0x3434fc98
+0,          9,          9,        1,    13440, 0xd219b282
+0,         10,         10,        1,    13440, 0xd2027a7c
+0,         11,         11,        1,    13440, 0xd50b5799
+0,         12,         12,        1,    13440, 0x091543c4
+0,         13,         13,        1,    13440, 0x26374c6b
+0,         14,         14,        1,    13440, 0x5b4f5e1e
+0,         15,         15,        1,    13440, 0x55ba92da
+0,         16,         16,        1,    13440, 0x1ff5cb4d
+0,         17,         17,        1,    13440, 0x0ccbda45
+0,         18,         18,        1,    13440, 0x5ff80e6a
+0,         19,         19,        1,    13440, 0x09df3417
+0,         20,         20,        1,    13440, 0xfbed3a0f
+0,         21,         21,        1,    13440, 0xd65c3c7f
+0,         22,         22,        1,    13440, 0xc8173576
+0,         23,         23,        1,    13440, 0xd5e521f8
+0,         24,         24,        1,    13440, 0xe440bb55
+0,         25,         25,        1,    13440, 0xcbeb95c8
+0,         26,         26,        1,    13440, 0x8cd66dba
+0,         27,         27,        1,    13440, 0x5f356cbc
+0,         28,         28,        1,    13440, 0x54e16ad7
+0,         29,         29,        1,    13440, 0x17ed8566
+0,         30,         30,        1,    13440, 0x1aa1c121
+0,         31,         31,        1,    13440, 0x64e31cac
+0,         32,         32,        1,    13440, 0x869677a4
+0,         33,         33,        1,    13440, 0x7df6cdba
+0,         34,         34,        1,    13440, 0x23f3ef45
+0,         35,         35,        1,    13440, 0x176217b4
+0,         36,         36,        1,    13440, 0x493897cb
+0,         37,         37,        1,    13440, 0x0591296d
+0,         38,         38,        1,    13440, 0xb58aeae8
+0,         39,         39,        1,    13440, 0x38fd7e58
+0,         40,         40,        1,    13440, 0x200c424c
+0,         41,         41,        1,    13440, 0x2ee42b14
+0,         42,         42,        1,    13440, 0xdcba2ae5
+0,         43,         43,        1,    13440, 0xbb102f41
+0,         44,         44,        1,    13440, 0x034d4b06
+0,         45,         45,        1,    13440, 0x62d99722
+0,         46,         46,        1,    13440, 0x174d9ce4
+0,         47,         47,        1,    13440, 0xf676bbc8
+0,         48,         48,        1,    13440, 0xe2e5bbef
+0,         49,         49,        1,    13440, 0x6ef0c2af
+0,         50,         50,        1,    13440, 0x8d08a917
+0,         51,         51,        1,    13440, 0x030d90e8
+0,         52,         52,        1,    13440, 0x4d6f9232
+0,         53,         53,        1,    13440, 0xb7a792f6
+0,         54,         54,        1,    13440, 0xa0daa330
+0,         55,         55,        1,    13440, 0xe9f870a3
+0,         56,         56,        1,    13440, 0xed4f36cb
+0,         57,         57,        1,    13440, 0x8a6f02c3
+0,         58,         58,        1,    13440, 0x663ee03d
+0,         59,         59,        1,    13440, 0x2571adef
 0,         60,         60,        1,    13440, 0x7533ad99
-0,         61,         61,        1,    13440, 0x4e70c2c9
-0,         62,         62,        1,    13440, 0x9ce5e3fa
-0,         63,         63,        1,    13440, 0xc788fbbc
-0,         64,         64,        1,    13440, 0xd36604a9
-0,         65,         65,        1,    13440, 0x246221a4
-0,         66,         66,        1,    13440, 0x290c5c2b
-0,         67,         67,        1,    13440, 0xde6c68ec
-0,         68,         68,        1,    13440, 0x56248dbf
-0,         69,         69,        1,    13440, 0x5b898cbd
-0,         70,         70,        1,    13440, 0x090574b9
-0,         71,         71,        1,    13440, 0x8df2814a
-0,         72,         72,        1,    13440, 0xd4a6b285
-0,         73,         73,        1,    13440, 0xa016e921
-0,         74,         74,        1,    13440, 0x7f93fdc1
-0,         75,         75,        1,    13440, 0xfd0dee6f
-0,         76,         76,        1,    13440, 0xef04ce0e
-0,         77,         77,        1,    13440, 0x7560bee3
-0,         78,         78,        1,    13440, 0x5a8cdc85
-0,         79,         79,        1,    13440, 0x4788f7bc
-0,         80,         80,        1,    13440, 0xc001e34d
-0,         81,         81,        1,    13440, 0xc687eb74
-0,         82,         82,        1,    13440, 0xbf20feba
-0,         83,         83,        1,    13440, 0xd32647a8
-0,         84,         84,        1,    13440, 0xe69a955a
-0,         85,         85,        1,    13440, 0x1b56951f
-0,         86,         86,        1,    13440, 0xd1977378
-0,         87,         87,        1,    13440, 0x1620357d
-0,         88,         88,        1,    13440, 0x2596116f
-0,         89,         89,        1,    13440, 0x7473feca
-0,         90,         90,        1,    13440, 0x7f92bb47
-0,         91,         91,        1,    13440, 0x6866a683
-0,         92,         92,        1,    13440, 0xe9b08d7e
-0,         93,         93,        1,    13440, 0xa3fd7546
-0,         94,         94,        1,    13440, 0xa4416522
-0,         95,         95,        1,    13440, 0xd8f5572e
-0,         96,         96,        1,    13440, 0xf5746dbd
-0,         97,         97,        1,    13440, 0x256a87c6
-0,         98,         98,        1,    13440, 0x722aa2c8
-0,         99,         99,        1,    13440, 0xb26de5f5
-0,        100,        100,        1,    13440, 0x117f0841
-0,        101,        101,        1,    13440, 0xda2d192c
-0,        102,        102,        1,    13440, 0xb022442d
-0,        103,        103,        1,    13440, 0xbc4044f2
-0,        104,        104,        1,    13440, 0x68b330da
-0,        105,        105,        1,    13440, 0xc07228cf
-0,        106,        106,        1,    13440, 0xaa3f3d44
-0,        107,        107,        1,    13440, 0x25867aad
-0,        108,        108,        1,    13440, 0xa3ecb432
-0,        109,        109,        1,    13440, 0x93ccdcbb
-0,        110,        110,        1,    13440, 0x8302fa4f
-0,        111,        111,        1,    13440, 0x2f960f33
-0,        112,        112,        1,    13440, 0x15d41d14
-0,        113,        113,        1,    13440, 0x636529d0
-0,        114,        114,        1,    13440, 0x11035be5
-0,        115,        115,        1,    13440, 0x9b6e9167
-0,        116,        116,        1,    13440, 0x7b01adc7
+0,         61,         61,        1,    13440, 0xe3aec2d4
+0,         62,         62,        1,    13440, 0x3368e416
+0,         63,         63,        1,    13440, 0xe2ecfbf5
+0,         64,         64,        1,    13440, 0x45010538
+0,         65,         65,        1,    13440, 0xc075222c
+0,         66,         66,        1,    13440, 0x5bf45cc4
+0,         67,         67,        1,    13440, 0xa06869b5
+0,         68,         68,        1,    13440, 0x1ff98e6f
+0,         69,         69,        1,    13440, 0x11c88d84
+0,         70,         70,        1,    13440, 0x95c275e8
+0,         71,         71,        1,    13440, 0x81a68285
+0,         72,         72,        1,    13440, 0xb903b402
+0,         73,         73,        1,    13440, 0xa9d2eb1c
+0,         74,         74,        1,    13440, 0x2c48ff65
+0,         75,         75,        1,    13440, 0xc024eff6
+0,         76,         76,        1,    13440, 0x41bacff0
+0,         77,         77,        1,    13440, 0x2cf9c144
+0,         78,         78,        1,    13440, 0x9e67de72
+0,         79,         79,        1,    13440, 0x3e74fa36
+0,         80,         80,        1,    13440, 0x9b9be609
+0,         81,         81,        1,    13440, 0x594eee16
+0,         82,         82,        1,    13440, 0x8a7c00d7
+0,         83,         83,        1,    13440, 0x56104a2a
+0,         84,         84,        1,    13440, 0xd94d97cc
+0,         85,         85,        1,    13440, 0x95d09887
+0,         86,         86,        1,    13440, 0xe02a769b
+0,         87,         87,        1,    13440, 0x847839d0
+0,         88,         88,        1,    13440, 0x47441606
+0,         89,         89,        1,    13440, 0x19b10373
+0,         90,         90,        1,    13440, 0x3ddfbf15
+0,         91,         91,        1,    13440, 0xf4fdab37
+0,         92,         92,        1,    13440, 0xfe9a92ad
+0,         93,         93,        1,    13440, 0xaa387bfb
+0,         94,         94,        1,    13440, 0xe57a6c85
+0,         95,         95,        1,    13440, 0x68ef5f30
+0,         96,         96,        1,    13440, 0x481d76f7
+0,         97,         97,        1,    13440, 0x5b0e9192
+0,         98,         98,        1,    13440, 0xebc1ac80
+0,         99,         99,        1,    13440, 0x13bfef3e
+0,        100,        100,        1,    13440, 0xb7b01291
+0,        101,        101,        1,    13440, 0xc8c72419
+0,        102,        102,        1,    13440, 0x9dca4f32
+0,        103,        103,        1,    13440, 0x67635158
+0,        104,        104,        1,    13440, 0x6c773e0d
+0,        105,        105,        1,    13440, 0x6c2f3777
+0,        106,        106,        1,    13440, 0x19574d97
+0,        107,        107,        1,    13440, 0xd9f48cc1
+0,        108,        108,        1,    13440, 0xd19dc87c
+0,        109,        109,        1,    13440, 0xa23cf2ab
+0,        110,        110,        1,    13440, 0x3f7611b6
+0,        111,        111,        1,    13440, 0x183d2723
+0,        112,        112,        1,    13440, 0xf79b3534
+0,        113,        113,        1,    13440, 0xcbba4280
+0,        114,        114,        1,    13440, 0x03777586
+0,        115,        115,        1,    13440, 0xea1aac72
+0,        116,        116,        1,    13440, 0xad27cae0
 0,        117,        117,        1,    13440, 0xa237e05d
-0,        118,        118,        1,    13440, 0xd2f4f134
-0,        119,        119,        1,    13440, 0x2052d368
-0,        120,        120,        1,    13440, 0x08f7ae0d
-0,        121,        121,        1,    13440, 0xa89185bc
-0,        122,        122,        1,    13440, 0xfa628236
-0,        123,        123,        1,    13440, 0xdf79848b
-0,        124,        124,        1,    13440, 0xd19a906f
-0,        125,        125,        1,    13440, 0x219f9324
-0,        126,        126,        1,    13440, 0x46509b6d
-0,        127,        127,        1,    13440, 0xc5d9a568
-0,        128,        128,        1,    13440, 0xb21aaaa8
-0,        129,        129,        1,    13440, 0x925a97ed
-0,        130,        130,        1,    13440, 0xc5e3557f
-0,        131,        131,        1,    13440, 0x7c57155a
-0,        132,        132,        1,    13440, 0x6b26d005
-0,        133,        133,        1,    13440, 0xfdc7b369
-0,        134,        134,        1,    13440, 0x99919fc2
-0,        135,        135,        1,    13440, 0xcfe889e4
-0,        136,        136,        1,    13440, 0xd1196856
-0,        137,        137,        1,    13440, 0xec8348c6
-0,        138,        138,        1,    13440, 0x5ede0d9a
-0,        139,        139,        1,    13440, 0x198ef66e
-0,        140,        140,        1,    13440, 0x62fcefdf
-0,        141,        141,        1,    13440, 0x7791f415
-0,        142,        142,        1,    13440, 0xfbdb0029
-0,        143,        143,        1,    13440, 0xdab12b01
-0,        144,        144,        1,    13440, 0x646b2d5f
-0,        145,        145,        1,    13440, 0x5410f52e
-0,        146,        146,        1,    13440, 0x7186eef8
-0,        147,        147,        1,    13440, 0xca251ef6
-0,        148,        148,        1,    13440, 0x757c3b43
-0,        149,        149,        1,    13440, 0x59ff4982
-0,        150,        150,        1,    13440, 0xbe8ff084
-0,        151,        151,        1,    13440, 0xc85a9e38
-0,        152,        152,        1,    13440, 0x541b9a19
-0,        153,        153,        1,    13440, 0x274893c9
-0,        154,        154,        1,    13440, 0x7634b5d2
-0,        155,        155,        1,    13440, 0x1bd8e10c
-0,        156,        156,        1,    13440, 0xa661dfb1
-0,        157,        157,        1,    13440, 0x9d01bf92
-0,        158,        158,        1,    13440, 0xcb1eb220
-0,        159,        159,        1,    13440, 0x0ce27d25
-0,        160,        160,        1,    13440, 0x523b594f
-0,        161,        161,        1,    13440, 0xf0a04c4f
-0,        162,        162,        1,    13440, 0x0f0ffc3d
-0,        163,        163,        1,    13440, 0xb0d8b778
-0,        164,        164,        1,    13440, 0x5137a642
-0,        165,        165,        1,    13440, 0xd213a552
-0,        166,        166,        1,    13440, 0xc2fbc9b1
-0,        167,        167,        1,    13440, 0xfc2ee379
-0,        168,        168,        1,    13440, 0xfb80f737
-0,        169,        169,        1,    13440, 0xd6cb2447
-0,        170,        170,        1,    13440, 0x124b606d
-0,        171,        171,        1,    13440, 0xf788a066
-0,        172,        172,        1,    13440, 0xa16eed6e
-0,        173,        173,        1,    13440, 0x73ff0f82
+0,        118,        118,        1,    13440, 0xb683f189
+0,        119,        119,        1,    13440, 0x2058d3cd
+0,        120,        120,        1,    13440, 0x715dae96
+0,        121,        121,        1,    13440, 0xd8f88677
+0,        122,        122,        1,    13440, 0x45818329
+0,        123,        123,        1,    13440, 0x69ad852f
+0,        124,        124,        1,    13440, 0x56369125
+0,        125,        125,        1,    13440, 0xdfde941b
+0,        126,        126,        1,    13440, 0xf1209c90
+0,        127,        127,        1,    13440, 0x82e6a6aa
+0,        128,        128,        1,    13440, 0xb0ceabd1
+0,        129,        129,        1,    13440, 0x05f899a6
+0,        130,        130,        1,    13440, 0x9ef95758
+0,        131,        131,        1,    13440, 0x63e716d9
+0,        132,        132,        1,    13440, 0x7cb0d149
+0,        133,        133,        1,    13440, 0x3585b4f1
+0,        134,        134,        1,    13440, 0x623ea1fc
+0,        135,        135,        1,    13440, 0x762b8c32
+0,        136,        136,        1,    13440, 0xc1b96add
+0,        137,        137,        1,    13440, 0x95e24baf
+0,        138,        138,        1,    13440, 0x74631106
+0,        139,        139,        1,    13440, 0x78b5fa14
+0,        140,        140,        1,    13440, 0x5f33f34a
+0,        141,        141,        1,    13440, 0x7e6ff799
+0,        142,        142,        1,    13440, 0x9f8303b0
+0,        143,        143,        1,    13440, 0x7c3d2eb9
+0,        144,        144,        1,    13440, 0x3c0530d2
+0,        145,        145,        1,    13440, 0xe7ecf960
+0,        146,        146,        1,    13440, 0x82c3f316
+0,        147,        147,        1,    13440, 0x008922b4
+0,        148,        148,        1,    13440, 0x0d263f5f
+0,        149,        149,        1,    13440, 0x57dc4dd0
+0,        150,        150,        1,    13440, 0xbcbbf4f1
+0,        151,        151,        1,    13440, 0x62e9a335
+0,        152,        152,        1,    13440, 0x65699f37
+0,        153,        153,        1,    13440, 0xe4b69939
+0,        154,        154,        1,    13440, 0xbd4ebb6c
+0,        155,        155,        1,    13440, 0xb7d6e71e
+0,        156,        156,        1,    13440, 0xfc0ae5b6
+0,        157,        157,        1,    13440, 0xe55ec65c
+0,        158,        158,        1,    13440, 0x2095b8fc
+0,        159,        159,        1,    13440, 0x479c8408
+0,        160,        160,        1,    13440, 0x2981604c
+0,        161,        161,        1,    13440, 0xa4e55397
+0,        162,        162,        1,    13440, 0x0bc703f8
+0,        163,        163,        1,    13440, 0xd43bbf89
+0,        164,        164,        1,    13440, 0xdcd6aeca
+0,        165,        165,        1,    13440, 0x07b1ad84
+0,        166,        166,        1,    13440, 0xfb17d20b
+0,        167,        167,        1,    13440, 0x0c4aebd9
+0,        168,        168,        1,    13440, 0x826effc4
+0,        169,        169,        1,    13440, 0x4ccf2ca4
+0,        170,        170,        1,    13440, 0xe4f968f3
+0,        171,        171,        1,    13440, 0xe1b4a93a
+0,        172,        172,        1,    13440, 0x8597f65e
+0,        173,        173,        1,    13440, 0xb4f7184f
