Merge commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721'

* commit 'f91fe24e9bd6912c29bbb03d8afe878e045f9721':
  g2meet: force simple idct for identical results over all fate configs

Conflicts:
	tests/ref/fate/g2m3
	tests/ref/fate/g2m4

Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-07-01 19:18:04 +02:00
4 changed files with 60 additions and 60 deletions

View File

@@ -1,29 +1,29 @@
#tb 0: 1001/24000
#tb 1: 1/44100
0, 0, 0, 1, 3824640, 0xf8cf3d18
0, 0, 0, 1, 3824640, 0x9a253d29
1, 0, 0, 16384, 32768, 0x6b41078a
1, 14288, 14288, 16384, 32768, 0x96f7bfa2
0, 12, 12, 1, 3824640, 0x29dc2af5
0, 15, 15, 1, 3824640, 0x0ef5287b
0, 16, 16, 1, 3824640, 0x84b5283d
0, 12, 12, 1, 3824640, 0xcb232b06
0, 15, 15, 1, 3824640, 0xb03c288c
0, 16, 16, 1, 3824640, 0x260b284e
1, 30672, 30672, 14336, 28672, 0xfafb3922
0, 18, 18, 1, 3824640, 0xb2972f1f
0, 19, 19, 1, 3824640, 0x5f59333c
0, 21, 21, 1, 3824640, 0x94643ee6
0, 22, 22, 1, 3824640, 0x646c4e89
0, 24, 24, 1, 3824640, 0x622e6412
0, 18, 18, 1, 3824640, 0x53ed2f30
0, 19, 19, 1, 3824640, 0x00af334d
0, 21, 21, 1, 3824640, 0x35ba3ef7
0, 22, 22, 1, 3824640, 0x05c24e9a
0, 24, 24, 1, 3824640, 0x03846423
1, 45005, 45005, 12288, 24576, 0x32d18657
0, 25, 25, 1, 3824640, 0x6a796412
0, 30, 30, 1, 3824640, 0xf4ee6412
0, 25, 25, 1, 3824640, 0x0bcf6423
0, 30, 30, 1, 3824640, 0x96446423
1, 57293, 57293, 10240, 20480, 0x7d89c440
0, 33, 33, 1, 3824640, 0xfd396412
0, 34, 34, 1, 3824640, 0x81666412
0, 36, 36, 1, 3824640, 0xcff46412
0, 33, 33, 1, 3824640, 0x9e8f6423
0, 34, 34, 1, 3824640, 0x22bc6423
0, 36, 36, 1, 3824640, 0x714a6423
1, 67533, 67533, 12288, 24576, 0x23d44d0c
0, 37, 37, 1, 3824640, 0x64b76412
0, 39, 39, 1, 3824640, 0xbaa36412
0, 40, 40, 1, 3824640, 0x12006412
0, 37, 37, 1, 3824640, 0x060d6423
0, 39, 39, 1, 3824640, 0x5bf96423
0, 40, 40, 1, 3824640, 0xb3476423
1, 79821, 79821, 12288, 24576, 0x77188395
0, 123, 123, 1, 3824640, 0x1dbe6412
0, 124, 124, 1, 3824640, 0x8f1e6412
0, 126, 126, 1, 3824640, 0x49286412
0, 123, 123, 1, 3824640, 0xbf056423
0, 124, 124, 1, 3824640, 0x30746423
0, 126, 126, 1, 3824640, 0xea6f6423