Merge commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01'

* commit '5e6ee38bd3cef0dd05f1dd7977c71f3479eb6d01':
  FATE: add cavs test
  cavsdec: export picture type in the output frame

Conflicts:
	tests/fate/video.mak

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

diff --cc libavcodec/cavs.h
Simple merge

diff --cc libavcodec/cavsdec.c
index ed2ed28ec952272c9ae9d41cc28b3f4e416ee410,cef6b953a5898eb11246bb00accd63e142ba5899..0074c4cf6d982ca20e0fceb4b7732a72d890c33f
--- 1/libavcodec/cavsdec.c
--- 2/libavcodec/cavsdec.c
+++ b/libavcodec/cavsdec.c
@@@ -673,9 -671,9 +673,9 @@@ static int decode_mb_i(AVSContext *h, i
      ff_cavs_modify_mb_i(h, &pred_mode_uv);
  
      /* get coded block pattern */
-     if (h->pic_type == AV_PICTURE_TYPE_I)
+     if (h->cur.f->pict_type == AV_PICTURE_TYPE_I)
          cbp_code = get_ue_golomb(gb);
 -    if (cbp_code > 63) {
 +    if (cbp_code > 63U) {
          av_log(h->avctx, AV_LOG_ERROR, "illegal intra cbp\n");
          return -1;
      }

diff --cc tests/fate/video.mak
index 5689f51de94bafb2beaab603223a91a98217c8eb,51315dfaac72b18fde0337e323b7efebf177da53..f8725b6e3d688d4fba2360e9376f260bb7be2f3f
--- 1/tests/fate/video.mak
--- 2/tests/fate/video.mak
+++ b/tests/fate/video.mak
@@@ -46,21 -43,25 +46,24 @@@ fate-bink-video-f: CMD = framecrc -i $(
  FATE_BINK_VIDEO += fate-bink-video-i
  fate-bink-video-i: CMD = framecrc -i $(SAMPLES)/bink/RazOnBull.bik -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO)
 -fate-bink-video: $(FATE_BINK_VIDEO)
 +FATE_VIDEO-$(call DEMDEC, BINK, BINK) += $(FATE_BINK_VIDEO)
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video
 +FATE_VIDEO-$(call DEMDEC, BMV, BMV_VIDEO) += fate-bmv-video
  fate-bmv-video: CMD = framecrc -i $(SAMPLES)/bmv/SURFING-partial.BMV -pix_fmt rgb24 -an
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs
++FATE_VIDEO-$(call DEMDEC, MPEGPS, CAVS) += fate-cavs
+ fate-cavs: CMD = framecrc -i $(SAMPLES)/cavs/cavs.mpg -an
+ 
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics
 +FATE_VIDEO-$(call DEMDEC, CDG, CDGRAPHICS) += fate-cdgraphics
  fate-cdgraphics: CMD = framecrc -i $(SAMPLES)/cdgraphics/BrotherJohn.cdg -pix_fmt rgb24 -t 1
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, CLJR) += fate-cljr
 +FATE_VIDEO-$(call DEMDEC, AVI, CLJR) += fate-cljr
  fate-cljr: CMD = framecrc -i $(SAMPLES)/cljr/testcljr-partial.avi
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVI, PNG) += fate-corepng
 +FATE_VIDEO-$(call DEMDEC, AVI, PNG) += fate-corepng
  fate-corepng: CMD = framecrc -i $(SAMPLES)/png1/corepng-partial.avi
  
 -FATE_SAMPLES_AVCONV-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs
 +FATE_VIDEO-$(call DEMDEC, AVS, AVS) += fate-creatureshock-avs
  fate-creatureshock-avs: CMD = framecrc -i $(SAMPLES)/creatureshock-avs/OUTATIME.AVS -pix_fmt rgb24
  
  FATE_CVID-$(CONFIG_AVI_DEMUXER) += fate-cvid-partial

diff --cc tests/ref/fate/cavs
index 0000000000000000000000000000000000000000,c96468a27b027e94d8d8082245ccbde9318be3f1..f9af8fa88a37fcff08825817455de7c064336020
mode 000000,100644..100644
--- /dev/null
--- 2/tests/ref/fate/cavs
+++ b/tests/ref/fate/cavs
@@@ -1,0 -1,171 +1,172 @@@
 -#tb 0: 1/90000
 -0,          0,          0,        0,   622080, 0x76183b91
 -0,       3624,       3624,        0,   622080, 0x2ca5e808
 -0,       7248,       7248,        0,   622080, 0xc503eda4
 -0,      10872,      10872,        0,   622080, 0xa0dbf06c
 -0,      14496,      14496,        0,   622080, 0xf4363cfa
 -0,      18120,      18120,        0,   622080, 0xaa7dd9b8
 -0,      21744,      21744,        0,   622080, 0x3ab6223b
 -0,      25368,      25368,        0,   622080, 0xe402644b
 -0,      28992,      28992,        0,   622080, 0xd0da3ade
 -0,      32616,      32616,        0,   622080, 0x0aff6151
 -0,      36240,      36240,        0,   622080, 0x02aea3d5
 -0,      39864,      39864,        0,   622080, 0x5d8eeccd
 -0,      43488,      43488,        0,   622080, 0x54384735
 -0,      47112,      47112,        0,   622080, 0x890d71c2
 -0,      50736,      50736,        0,   622080, 0xc60ae25b
 -0,      54360,      54360,        0,   622080, 0xe589e774
 -0,      57984,      57984,        0,   622080, 0x03471e74
 -0,      61608,      61608,        0,   622080, 0x4e22302c
 -0,      65232,      65232,        0,   622080, 0x00333583
 -0,      68856,      68856,        0,   622080, 0xd6eae7d9
 -0,      72480,      72480,        0,   622080, 0x72fe94f7
 -0,      76104,      76104,        0,   622080, 0x3ebbad1e
 -0,      79728,      79728,        0,   622080, 0x2fb1de4b
 -0,      83352,      83352,        0,   622080, 0x3bfea6d2
 -0,      86976,      86976,        0,   622080, 0x0fb551b2
 -0,      90600,      90600,        0,   622080, 0xb203284f
 -0,      94224,      94224,        0,   622080, 0xb3baac30
 -0,      97200,      97200,        0,   622080, 0x15f2c1c7
 -0,     100824,     100824,        0,   622080, 0xb2b530ce
 -0,     104448,     104448,        0,   622080, 0xbbaaf241
 -0,     108072,     108072,        0,   622080, 0x01bc9dfc
 -0,     111696,     111696,        0,   622080, 0x8a449a42
 -0,     115320,     115320,        0,   622080, 0xdc63d73f
 -0,     118944,     118944,        0,   622080, 0xf06bc231
 -0,     122568,     122568,        0,   622080, 0x19e04295
 -0,     126192,     126192,        0,   622080, 0x1e7d1acd
 -0,     129816,     129816,        0,   622080, 0x43878b48
 -0,     133440,     133440,        0,   622080, 0xcd94b702
 -0,     137064,     137064,        0,   622080, 0xd2706cf1
 -0,     140688,     140688,        0,   622080, 0x47d636f3
 -0,     144312,     144312,        0,   622080, 0x4a516acc
 -0,     147936,     147936,        0,   622080, 0x52b7d89a
 -0,     151560,     151560,        0,   622080, 0xc9ba03be
 -0,     155184,     155184,        0,   622080, 0x6d17785e
 -0,     158808,     158808,        0,   622080, 0x8264871b
 -0,     162432,     162432,        0,   622080, 0xd59c84c0
 -0,     166056,     166056,        0,   622080, 0x2b86d6cd
 -0,     169680,     169680,        0,   622080, 0x9c5a5f51
 -0,     173304,     173304,        0,   622080, 0x221f79ca
 -0,     176928,     176928,        0,   622080, 0x98edb3ec
 -0,     180552,     180552,        0,   622080, 0x9a31262c
 -0,     184176,     184176,        0,   622080, 0x18f48378
 -0,     187800,     187800,        0,   622080, 0x957c3d9c
 -0,     191424,     191424,        0,   622080, 0x9cc6866e
 -0,     195048,     195048,        0,   622080, 0x45613726
 -0,     198672,     198672,        0,   622080, 0x7a6c5e65
 -0,     202296,     202296,        0,   622080, 0x976d7a11
 -0,     205200,     205200,        0,   622080, 0x192aea08
 -0,     208824,     208824,        0,   622080, 0x8d4fc823
 -0,     212448,     212448,        0,   622080, 0x1f9c55d7
 -0,     216072,     216072,        0,   622080, 0xd4336d41
 -0,     219696,     219696,        0,   622080, 0x7aa650cd
 -0,     223320,     223320,        0,   622080, 0x8efaaeb1
 -0,     226944,     226944,        0,   622080, 0x3d8c3053
 -0,     230568,     230568,        0,   622080, 0x1e2b64b0
 -0,     234192,     234192,        0,   622080, 0x0436b1a7
 -0,     237816,     237816,        0,   622080, 0xc5120072
 -0,     241440,     241440,        0,   622080, 0x0203b245
 -0,     245064,     245064,        0,   622080, 0x9815582b
 -0,     248688,     248688,        0,   622080, 0x3c60c359
 -0,     252312,     252312,        0,   622080, 0x1a26b948
 -0,     255936,     255936,        0,   622080, 0x56079812
 -0,     259560,     259560,        0,   622080, 0x7b192a55
 -0,     263184,     263184,        0,   622080, 0x335632ab
 -0,     266808,     266808,        0,   622080, 0xd0c12eb8
 -0,     270432,     270432,        0,   622080, 0x93bf46cb
 -0,     274056,     274056,        0,   622080, 0xce67ce24
 -0,     277680,     277680,        0,   622080, 0xff95bb26
 -0,     281304,     281304,        0,   622080, 0x5e750705
 -0,     284928,     284928,        0,   622080, 0x45a35725
 -0,     288552,     288552,        0,   622080, 0xd8e93c39
 -0,     292176,     292176,        0,   622080, 0xa9f8db50
 -0,     295800,     295800,        0,   622080, 0xf90a862e
 -0,     299424,     299424,        0,   622080, 0x5e5a4216
 -0,     303048,     303048,        0,   622080, 0xaaf45ed6
 -0,     306672,     306672,        0,   622080, 0x1933cda5
 -0,     310296,     310296,        0,   622080, 0x7ff68d91
 -0,     313200,     313200,        0,   622080, 0x10038fe9
 -0,     316824,     316824,        0,   622080, 0x9b3425a6
 -0,     320448,     320448,        0,   622080, 0x8d2a141d
 -0,     324072,     324072,        0,   622080, 0x698a333e
 -0,     327696,     327696,        0,   622080, 0x334685d1
 -0,     331320,     331320,        0,   622080, 0x40317d40
 -0,     334944,     334944,        0,   622080, 0xd3c6f519
 -0,     338568,     338568,        0,   622080, 0xfc2210c2
 -0,     342192,     342192,        0,   622080, 0x3761df34
 -0,     345816,     345816,        0,   622080, 0xef25462a
 -0,     349440,     349440,        0,   622080, 0x0fd38121
 -0,     353064,     353064,        0,   622080, 0x184856a6
 -0,     356688,     356688,        0,   622080, 0xc57c9f12
 -0,     360312,     360312,        0,   622080, 0x39874291
 -0,     363936,     363936,        0,   622080, 0x7c13cec4
 -0,     367560,     367560,        0,   622080, 0xc4192a76
 -0,     371184,     371184,        0,   622080, 0x2af404e3
 -0,     374808,     374808,        0,   622080, 0x1ee18f41
 -0,     378432,     378432,        0,   622080, 0xfb4d9ee5
 -0,     382056,     382056,        0,   622080, 0x50aae4ff
 -0,     385680,     385680,        0,   622080, 0x030f91fe
 -0,     389304,     389304,        0,   622080, 0x3a3ee08c
 -0,     392928,     392928,        0,   622080, 0x50121423
 -0,     396552,     396552,        0,   622080, 0xda39e2d6
 -0,     400176,     400176,        0,   622080, 0x9e13ccd6
 -0,     403800,     403800,        0,   622080, 0xb72a22a7
 -0,     407424,     407424,        0,   622080, 0xb76904d5
 -0,     411048,     411048,        0,   622080, 0xcffa04a8
 -0,     414672,     414672,        0,   622080, 0x2984bf3f
 -0,     418296,     418296,        0,   622080, 0x274b5778
 -0,     421200,     421200,        0,   622080, 0xf059413a
 -0,     424824,     424824,        0,   622080, 0x969fae57
 -0,     428448,     428448,        0,   622080, 0x75c29097
 -0,     432072,     432072,        0,   622080, 0x2bf3b07d
 -0,     435696,     435696,        0,   622080, 0x9f43271d
 -0,     439320,     439320,        0,   622080, 0x67bf23f3
 -0,     442944,     442944,        0,   622080, 0xa8edcf33
 -0,     446568,     446568,        0,   622080, 0x17a0789e
 -0,     450192,     450192,        0,   622080, 0x14b67cc7
 -0,     453816,     453816,        0,   622080, 0x779215cd
 -0,     457440,     457440,        0,   622080, 0x8b460a21
 -0,     461064,     461064,        0,   622080, 0x0502ad7d
 -0,     464688,     464688,        0,   622080, 0x6860678f
 -0,     468312,     468312,        0,   622080, 0xe180469e
 -0,     471936,     471936,        0,   622080, 0x9a992835
 -0,     475560,     475560,        0,   622080, 0x2efafa33
 -0,     479184,     479184,        0,   622080, 0xe24e59b2
 -0,     482808,     482808,        0,   622080, 0xfb774d53
 -0,     486432,     486432,        0,   622080, 0x3de4ea81
 -0,     490056,     490056,        0,   622080, 0xaf9aa1d6
 -0,     493680,     493680,        0,   622080, 0xa0e3722f
 -0,     497304,     497304,        0,   622080, 0x81684492
 -0,     500928,     500928,        0,   622080, 0xa4e971fb
 -0,     504552,     504552,        0,   622080, 0x4a1903c8
 -0,     508176,     508176,        0,   622080, 0x26304e4a
 -0,     511800,     511800,        0,   622080, 0x867983a4
 -0,     515424,     515424,        0,   622080, 0x2e7e4d13
 -0,     519048,     519048,        0,   622080, 0x736f4682
 -0,     522672,     522672,        0,   622080, 0x426a95fa
 -0,     526296,     526296,        0,   622080, 0x2bc8850c
 -0,     529200,     529200,        0,   622080, 0x047e77ab
 -0,     532824,     532824,        0,   622080, 0x414ab77f
 -0,     536448,     536448,        0,   622080, 0x42681090
 -0,     540072,     540072,        0,   622080, 0x80744ccb
 -0,     543696,     543696,        0,   622080, 0x50e2ecc0
 -0,     547320,     547320,        0,   622080, 0x5c9fe70e
 -0,     550944,     550944,        0,   622080, 0x016461ee
 -0,     554568,     554568,        0,   622080, 0xd42f019a
 -0,     558192,     558192,        0,   622080, 0x8171bf41
 -0,     561816,     561816,        0,   622080, 0xf4d8ef7e
 -0,     565440,     565440,        0,   622080, 0xf2d513c8
 -0,     569064,     569064,        0,   622080, 0xb5b07704
 -0,     572688,     572688,        0,   622080, 0x2168a07a
 -0,     576312,     576312,        0,   622080, 0x840418f9
 -0,     579936,     579936,        0,   622080, 0xd36f1b7c
 -0,     583560,     583560,        0,   622080, 0x52532604
 -0,     587184,     587184,        0,   622080, 0x0856d6eb
 -0,     590808,     590808,        0,   622080, 0x21748734
 -0,     594432,     594432,        0,   622080, 0xbd315c05
 -0,     598056,     598056,        0,   622080, 0x1cea8103
 -0,     601680,     601680,        0,   622080, 0x71f6e3cb
 -0,     605304,     605304,        0,   622080, 0xb12d7aa7
 -0,     608928,     608928,        0,   622080, 0x549b2acb
++#tb 0: 1/25
++0,          0,          0,        1,   622080, 0x76183b91
++0,          1,          1,        1,   622080, 0x2ca5e808
++0,          2,          2,        1,   622080, 0xc503eda4
++0,          3,          3,        1,   622080, 0xa0dbf06c
++0,          4,          4,        1,   622080, 0xf4363cfa
++0,          5,          5,        1,   622080, 0xaa7dd9b8
++0,          6,          6,        1,   622080, 0x3ab6223b
++0,          7,          7,        1,   622080, 0xe402644b
++0,          8,          8,        1,   622080, 0xd0da3ade
++0,          9,          9,        1,   622080, 0x0aff6151
++0,         10,         10,        1,   622080, 0x02aea3d5
++0,         11,         11,        1,   622080, 0x5d8eeccd
++0,         12,         12,        1,   622080, 0x54384735
++0,         13,         13,        1,   622080, 0x890d71c2
++0,         14,         14,        1,   622080, 0xc60ae25b
++0,         15,         15,        1,   622080, 0xe589e774
++0,         16,         16,        1,   622080, 0x03471e74
++0,         17,         17,        1,   622080, 0x4e22302c
++0,         18,         18,        1,   622080, 0x00333583
++0,         19,         19,        1,   622080, 0xd6eae7d9
++0,         20,         20,        1,   622080, 0x72fe94f7
++0,         21,         21,        1,   622080, 0x3ebbad1e
++0,         22,         22,        1,   622080, 0x2fb1de4b
++0,         23,         23,        1,   622080, 0x3bfea6d2
++0,         24,         24,        1,   622080, 0x0fb551b2
++0,         25,         25,        1,   622080, 0xb203284f
++0,         26,         26,        1,   622080, 0xb3baac30
++0,         27,         27,        1,   622080, 0x15f2c1c7
++0,         28,         28,        1,   622080, 0xb2b530ce
++0,         29,         29,        1,   622080, 0xbbaaf241
++0,         30,         30,        1,   622080, 0x01bc9dfc
++0,         31,         31,        1,   622080, 0x8a449a42
++0,         32,         32,        1,   622080, 0xdc63d73f
++0,         33,         33,        1,   622080, 0xf06bc231
++0,         34,         34,        1,   622080, 0x19e04295
++0,         35,         35,        1,   622080, 0x1e7d1acd
++0,         36,         36,        1,   622080, 0x43878b48
++0,         37,         37,        1,   622080, 0xcd94b702
++0,         38,         38,        1,   622080, 0xd2706cf1
++0,         39,         39,        1,   622080, 0x47d636f3
++0,         40,         40,        1,   622080, 0x4a516acc
++0,         41,         41,        1,   622080, 0x52b7d89a
++0,         42,         42,        1,   622080, 0xc9ba03be
++0,         43,         43,        1,   622080, 0x6d17785e
++0,         44,         44,        1,   622080, 0x8264871b
++0,         45,         45,        1,   622080, 0xd59c84c0
++0,         46,         46,        1,   622080, 0x2b86d6cd
++0,         47,         47,        1,   622080, 0x9c5a5f51
++0,         48,         48,        1,   622080, 0x221f79ca
++0,         49,         49,        1,   622080, 0x98edb3ec
++0,         50,         50,        1,   622080, 0x9a31262c
++0,         51,         51,        1,   622080, 0x18f48378
++0,         52,         52,        1,   622080, 0x957c3d9c
++0,         53,         53,        1,   622080, 0x9cc6866e
++0,         54,         54,        1,   622080, 0x45613726
++0,         55,         55,        1,   622080, 0x7a6c5e65
++0,         56,         56,        1,   622080, 0x976d7a11
++0,         57,         57,        1,   622080, 0x192aea08
++0,         58,         58,        1,   622080, 0x8d4fc823
++0,         59,         59,        1,   622080, 0x1f9c55d7
++0,         60,         60,        1,   622080, 0xd4336d41
++0,         61,         61,        1,   622080, 0x7aa650cd
++0,         62,         62,        1,   622080, 0x8efaaeb1
++0,         63,         63,        1,   622080, 0x3d8c3053
++0,         64,         64,        1,   622080, 0x1e2b64b0
++0,         65,         65,        1,   622080, 0x0436b1a7
++0,         66,         66,        1,   622080, 0xc5120072
++0,         67,         67,        1,   622080, 0x0203b245
++0,         68,         68,        1,   622080, 0x9815582b
++0,         69,         69,        1,   622080, 0x3c60c359
++0,         70,         70,        1,   622080, 0x1a26b948
++0,         71,         71,        1,   622080, 0x56079812
++0,         72,         72,        1,   622080, 0x7b192a55
++0,         73,         73,        1,   622080, 0x335632ab
++0,         74,         74,        1,   622080, 0xd0c12eb8
++0,         75,         75,        1,   622080, 0x93bf46cb
++0,         76,         76,        1,   622080, 0xce67ce24
++0,         77,         77,        1,   622080, 0xff95bb26
++0,         78,         78,        1,   622080, 0x5e750705
++0,         79,         79,        1,   622080, 0x45a35725
++0,         80,         80,        1,   622080, 0xd8e93c39
++0,         81,         81,        1,   622080, 0xa9f8db50
++0,         82,         82,        1,   622080, 0xf90a862e
++0,         83,         83,        1,   622080, 0x5e5a4216
++0,         84,         84,        1,   622080, 0xaaf45ed6
++0,         85,         85,        1,   622080, 0x1933cda5
++0,         86,         86,        1,   622080, 0x7ff68d91
++0,         87,         87,        1,   622080, 0x10038fe9
++0,         88,         88,        1,   622080, 0x9b3425a6
++0,         89,         89,        1,   622080, 0x8d2a141d
++0,         90,         90,        1,   622080, 0x698a333e
++0,         91,         91,        1,   622080, 0x334685d1
++0,         92,         92,        1,   622080, 0x40317d40
++0,         93,         93,        1,   622080, 0xd3c6f519
++0,         94,         94,        1,   622080, 0xfc2210c2
++0,         95,         95,        1,   622080, 0x3761df34
++0,         96,         96,        1,   622080, 0xef25462a
++0,         97,         97,        1,   622080, 0x0fd38121
++0,         98,         98,        1,   622080, 0x184856a6
++0,         99,         99,        1,   622080, 0xc57c9f12
++0,        100,        100,        1,   622080, 0x39874291
++0,        101,        101,        1,   622080, 0x7c13cec4
++0,        102,        102,        1,   622080, 0xc4192a76
++0,        103,        103,        1,   622080, 0x2af404e3
++0,        104,        104,        1,   622080, 0x1ee18f41
++0,        105,        105,        1,   622080, 0xfb4d9ee5
++0,        106,        106,        1,   622080, 0x50aae4ff
++0,        107,        107,        1,   622080, 0x030f91fe
++0,        108,        108,        1,   622080, 0x3a3ee08c
++0,        109,        109,        1,   622080, 0x50121423
++0,        110,        110,        1,   622080, 0xda39e2d6
++0,        111,        111,        1,   622080, 0x9e13ccd6
++0,        112,        112,        1,   622080, 0xb72a22a7
++0,        113,        113,        1,   622080, 0xb76904d5
++0,        114,        114,        1,   622080, 0xcffa04a8
++0,        115,        115,        1,   622080, 0x2984bf3f
++0,        116,        116,        1,   622080, 0x274b5778
++0,        117,        117,        1,   622080, 0xf059413a
++0,        118,        118,        1,   622080, 0x969fae57
++0,        119,        119,        1,   622080, 0x75c29097
++0,        120,        120,        1,   622080, 0x2bf3b07d
++0,        121,        121,        1,   622080, 0x9f43271d
++0,        122,        122,        1,   622080, 0x67bf23f3
++0,        123,        123,        1,   622080, 0xa8edcf33
++0,        124,        124,        1,   622080, 0x17a0789e
++0,        125,        125,        1,   622080, 0x14b67cc7
++0,        126,        126,        1,   622080, 0x779215cd
++0,        127,        127,        1,   622080, 0x8b460a21
++0,        128,        128,        1,   622080, 0x0502ad7d
++0,        129,        129,        1,   622080, 0x6860678f
++0,        130,        130,        1,   622080, 0xe180469e
++0,        131,        131,        1,   622080, 0x9a992835
++0,        132,        132,        1,   622080, 0x2efafa33
++0,        133,        133,        1,   622080, 0xe24e59b2
++0,        134,        134,        1,   622080, 0xfb774d53
++0,        135,        135,        1,   622080, 0x3de4ea81
++0,        136,        136,        1,   622080, 0xaf9aa1d6
++0,        137,        137,        1,   622080, 0xa0e3722f
++0,        138,        138,        1,   622080, 0x81684492
++0,        139,        139,        1,   622080, 0xa4e971fb
++0,        140,        140,        1,   622080, 0x4a1903c8
++0,        141,        141,        1,   622080, 0x26304e4a
++0,        142,        142,        1,   622080, 0x867983a4
++0,        143,        143,        1,   622080, 0x2e7e4d13
++0,        144,        144,        1,   622080, 0x736f4682
++0,        145,        145,        1,   622080, 0x426a95fa
++0,        146,        146,        1,   622080, 0x2bc8850c
++0,        147,        147,        1,   622080, 0x047e77ab
++0,        148,        148,        1,   622080, 0x414ab77f
++0,        149,        149,        1,   622080, 0x42681090
++0,        150,        150,        1,   622080, 0x80744ccb
++0,        151,        151,        1,   622080, 0x50e2ecc0
++0,        152,        152,        1,   622080, 0x5c9fe70e
++0,        153,        153,        1,   622080, 0x016461ee
++0,        154,        154,        1,   622080, 0xd42f019a
++0,        155,        155,        1,   622080, 0x8171bf41
++0,        156,        156,        1,   622080, 0xf4d8ef7e
++0,        157,        157,        1,   622080, 0xf2d513c8
++0,        158,        158,        1,   622080, 0xb5b07704
++0,        159,        159,        1,   622080, 0x2168a07a
++0,        160,        160,        1,   622080, 0x840418f9
++0,        161,        161,        1,   622080, 0xd36f1b7c
++0,        162,        162,        1,   622080, 0x52532604
++0,        163,        163,        1,   622080, 0x0856d6eb
++0,        164,        164,        1,   622080, 0x21748734
++0,        165,        165,        1,   622080, 0xbd315c05
++0,        166,        166,        1,   622080, 0x1cea8103
++0,        167,        167,        1,   622080, 0x71f6e3cb
++0,        168,        168,        1,   622080, 0xb12d7aa7
++0,        169,        169,        1,   622080, 0x54dd2acb
++0,        170,        170,        1,   622080, 0xe8f93765