Merge remote-tracking branch 'qatar/master'

* qatar/master: (25 commits)
  vcr1: Add vcr1_ prefixes to all static functions with generic names.
  vcr1: Fix return type of common_init to match the function pointer signature.
  vcr1enc: Replace obsolete get_bit_count by put_bits_count/flush_put_bits.
  motion-test: remove disabled code
  gxfenc: remove disabled half-implemented MJPEG tag
  x86: use more standard construct for setting ASM functions in FFT code
  fate: westwood-aud: disable decoding
  fate: caf: disable decoding
  fate: film-cvid: drop pcm audio and rename test
  fate: d-cinema-demux: drop unnecessary flags
  fate: split off dpcm-interplay from interplay-mve tests
  fate: rename funcom-iss to adpcm-ima-iss
  fate: rename cryo-apc to adpcm-ima-apc
  fate: rename adpcm-psx-str-v3 to adpcm-xa
  fate: split off adpcm-ms-mono test from dxa-feeble
  fate: split off adpcm-ima-ws test from vqa-cc
  fate: add adpcm-ima-smjpeg test
  fate: split off adpcm-ima-amv from amv test
  fate: separate bmv audio and video tests
  fate: separate delphine-cin audio and video tests
  ...

Conflicts:
	doc/platform.texi
	libavcodec/vcr1.c
	tests/fate/audio.mak
	tests/fate/demux.mak
	tests/fate/video.mak
	tests/ref/fate/ea-mad-pcm-planar
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/mtv
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/qtrle-2bit
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
	tests/ref/fate/vqa-cc

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

1 files changed, 0 insertions, 114 deletions

diff --git a/tests/ref/fate/truemotion1-15 b/tests/ref/fate/truemotion1-15
index 9e7f9c8d8c..af4a3205d8 100644
--- a/tests/ref/fate/truemotion1-15
+++ b/tests/ref/fate/truemotion1-15
@@ -1,220 +1,106 @@
 #tb 0: 1/15
-#tb 1: 1/44100
 0,          0,          0,        1,   161280, 0x677c9fb3
-1,          0,          0,     2708,    10832, 0xe1a811fa
-1,       2708,       2708,     2708,    10832, 0xb47841f9
 0,          1,          1,        1,   161280, 0xaa280e0a
-1,       5416,       5416,     2708,    10832, 0x839eedf1
 0,          2,          2,        1,   161280, 0x8a4d2225
-1,       8124,       8124,     2708,    10832, 0xb48b1f60
 0,          3,          3,        1,   161280, 0xf10f46a8
-1,      10832,      10832,     2708,    10832, 0x743936c0
 0,          4,          4,        1,   161280, 0x98d9eab6
-1,      13540,      13540,     2708,    10832, 0xe1f039fb
 0,          5,          5,        1,   161280, 0xa543ae1e
-1,      16248,      16248,     2708,    10832, 0xef00751a
 0,          6,          6,        1,   161280, 0x79d717ae
-1,      18956,      18956,     2708,    10832, 0x401ed099
 0,          7,          7,        1,   161280, 0x1a87e2cb
-1,      21665,      21665,     2708,    10832, 0x432a53bd
 0,          8,          8,        1,   161280, 0xe5c000ac
-1,      24373,      24373,     2708,    10832, 0xc4276bfd
 0,          9,          9,        1,   161280, 0xa5827077
-1,      27081,      27081,     2708,    10832, 0x51f0fa8c
 0,         10,         10,        1,   161280, 0xfd0615ee
-1,      29789,      29789,     2708,    10832, 0xcebae622
 0,         11,         11,        1,   161280, 0xc6fdc861
-1,      32497,      32497,     2708,    10832, 0xe9f6dc1f
-1,      35205,      35205,     2708,    10832, 0xda087fee
 0,         12,         12,        1,   161280, 0xaa007c7e
-1,      37913,      37913,     2708,    10832, 0x67a621bb
 0,         13,         13,        1,   161280, 0xf15e3a96
-1,      40621,      40621,     2708,    10832, 0xd7be207f
 0,         14,         14,        1,   161280, 0xce827ae1
-1,      43329,      43329,     2708,    10832, 0x19d32507
 0,         15,         15,        1,   161280, 0xf379fc13
-1,      46037,      46037,     2708,    10832, 0xe1a3fbfa
 0,         16,         16,        1,   161280, 0x89686a0c
-1,      48745,      48745,     2708,    10832, 0xd10df779
 0,         17,         17,        1,   161280, 0x7e8342bd
-1,      51453,      51453,     2708,    10832, 0x4428e1a7
 0,         18,         18,        1,   161280, 0x640dab86
-1,      54161,      54161,     2708,    10832, 0x7ea9b33d
 0,         19,         19,        1,   161280, 0xc6a86456
-1,      56869,      56869,     2708,    10832, 0x6852a5a5
 0,         20,         20,        1,   161280, 0xe360b538
-1,      59578,      59578,     2708,    10832, 0xfeb78863
 0,         21,         21,        1,   161280, 0xbcc21064
-1,      62286,      62286,     2708,    10832, 0xf157f928
 0,         22,         22,        1,   161280, 0x95bc4e63
-1,      64994,      64994,     2708,    10832, 0x86414b3e
 0,         23,         23,        1,   161280, 0x390fa1bd
-1,      67702,      67702,     2708,    10832, 0x2e28cdf6
-1,      70410,      70410,     2708,    10832, 0x00212e44
 0,         24,         24,        1,   161280, 0xa35b3bb9
-1,      73118,      73118,     2708,    10832, 0x2d7f9378
 0,         25,         25,        1,   161280, 0x730b0779
-1,      75826,      75826,     2708,    10832, 0x84cb25d7
 0,         26,         26,        1,   161280, 0xf3c3a3eb
-1,      78534,      78534,     2708,    10832, 0x3aca41fa
 0,         27,         27,        1,   161280, 0x676ecbaa
-1,      81242,      81242,     2708,    10832, 0x27ad34b9
 0,         28,         28,        1,   161280, 0x06c4a4e5
-1,      83950,      83950,     2708,    10832, 0xe665144a
 0,         29,         29,        1,   161280, 0x177d26d9
-1,      86658,      86658,     2708,    10832, 0xf9546626
 0,         30,         30,        1,   161280, 0xdaf69ebe
-1,      89366,      89366,     2708,    10832, 0xe71c4f22
 0,         31,         31,        1,   161280, 0xabadc296
-1,      92074,      92074,     2708,    10832, 0x5e61869c
 0,         32,         32,        1,   161280, 0xec144665
-1,      94782,      94782,     2708,    10832, 0x571d2c10
 0,         33,         33,        1,   161280, 0x6785aa48
-1,      97490,      97490,     2708,    10832, 0xf0e08cd5
 0,         34,         34,        1,   161280, 0x2a0cfcaf
-1,     100199,     100199,     2708,    10832, 0x66650e49
 0,         35,         35,        1,   161280, 0x9288d513
-1,     102907,     102907,     2708,    10832, 0x4024deaf
-1,     105615,     105615,     2708,    10832, 0xda7bdb14
 0,         36,         36,        1,   161280, 0x1d295ad0
-1,     108323,     108323,     2708,    10832, 0xc27a342f
 0,         37,         37,        1,   161280, 0xb9fd8406
-1,     111031,     111031,     2708,    10832, 0x574fe679
 0,         38,         38,        1,   161280, 0x98bced49
-1,     113739,     113739,     2708,    10832, 0x37db464e
 0,         39,         39,        1,   161280, 0x42e6fbae
-1,     116447,     116447,     2708,    10832, 0xb1fa2a83
 0,         40,         40,        1,   161280, 0xfd218209
-1,     119155,     119155,     2708,    10832, 0x3d98d9b7
 0,         41,         41,        1,   161280, 0x21c2ef31
-1,     121863,     121863,     2708,    10832, 0xb7c908e2
 0,         42,         42,        1,   161280, 0xce4be932
-1,     124571,     124571,     2708,    10832, 0x9f7e44d8
 0,         43,         43,        1,   161280, 0xd5c0d5fc
-1,     127279,     127279,     2708,    10832, 0xae9b8774
 0,         44,         44,        1,   161280, 0xf8d13076
-1,     129987,     129987,     2708,    10832, 0x36916e3f
 0,         45,         45,        1,   161280, 0xdbf86007
-1,     132695,     132695,     2708,    10832, 0xd785f5ef
 0,         46,         46,        1,   161280, 0x9475a651
-1,     135403,     135403,     2708,    10832, 0x2a3a5673
-1,     138112,     138112,     2708,    10832, 0x7320e379
 0,         47,         47,        1,   161280, 0x41bf1542
-1,     140820,     140820,     2708,    10832, 0xec787be5
 0,         48,         48,        1,   161280, 0x6945297f
-1,     143528,     143528,     2708,    10832, 0xd0d13aa0
 0,         49,         49,        1,   161280, 0x2282025e
-1,     146236,     146236,     2708,    10832, 0x34dfcb17
 0,         50,         50,        1,   161280, 0x55aace0c
-1,     148944,     148944,     2708,    10832, 0x1a9c29f1
 0,         51,         51,        1,   161280, 0xc78aa51c
-1,     151652,     151652,     2708,    10832, 0x3e73dcc1
 0,         52,         52,        1,   161280, 0xb4b84e6c
-1,     154360,     154360,     2708,    10832, 0x7855b053
 0,         53,         53,        1,   161280, 0x3bbb3e44
-1,     157068,     157068,     2708,    10832, 0x5588df8f
 0,         54,         54,        1,   161280, 0x4dd89d80
-1,     159776,     159776,     2708,    10832, 0x6f621299
 0,         55,         55,        1,   161280, 0xa446a5c5
-1,     162484,     162484,     2708,    10832, 0xce7f39c2
 0,         56,         56,        1,   161280, 0x8f56b1d6
-1,     165192,     165192,     2708,    10832, 0xd88e6552
 0,         57,         57,        1,   161280, 0xa170df87
-1,     167900,     167900,     2708,    10832, 0xddc63597
 0,         58,         58,        1,   161280, 0x4740a4df
-1,     170608,     170608,     2708,    10832, 0xe3071865
-1,     173316,     173316,     2708,    10832, 0x2a44a123
 0,         59,         59,        1,   161280, 0x86608ee7
-1,     176024,     176024,     2708,    10832, 0x08d85d45
 0,         60,         60,        1,   161280, 0x629b4543
-1,     178733,     178733,     2708,    10832, 0x4dc5f83a
 0,         61,         61,        1,   161280, 0x697fb952
-1,     181441,     181441,     2708,    10832, 0x89497812
 0,         62,         62,        1,   161280, 0x98e84a51
-1,     184149,     184149,     2708,    10832, 0x9ee1db54
 0,         63,         63,        1,   161280, 0x97949a90
-1,     186857,     186857,     2708,    10832, 0x5277d611
 0,         64,         64,        1,   161280, 0x6a8c9b96
-1,     189565,     189565,     2708,    10832, 0x570a619c
 0,         65,         65,        1,   161280, 0xafa714ab
-1,     192273,     192273,     2708,    10832, 0xa217d70f
 0,         66,         66,        1,   161280, 0x0cf39314
-1,     194981,     194981,     2708,    10832, 0x6f0ecbf4
 0,         67,         67,        1,   161280, 0x9ccc8171
-1,     197689,     197689,     2708,    10832, 0x2704b114
 0,         68,         68,        1,   161280, 0x8232d5a8
-1,     200397,     200397,     2708,    10832, 0xf24e679f
 0,         69,         69,        1,   161280, 0x250dd5cb
-1,     203105,     203105,     2708,    10832, 0x05572099
 0,         70,         70,        1,   161280, 0xf764e43a
-1,     205813,     205813,     2708,    10832, 0x33942d0c
-1,     208521,     208521,     2708,    10832, 0xa77ea674
 0,         71,         71,        1,   161280, 0x2f4bec00
-1,     211229,     211229,     2708,    10832, 0xeba663bc
 0,         72,         72,        1,   161280, 0x76f1598b
-1,     213937,     213937,     2708,    10832, 0x1338524a
 0,         73,         73,        1,   161280, 0xa91b84da
-1,     216645,     216645,     2708,    10832, 0x6182b0b3
 0,         74,         74,        1,   161280, 0x011a77fb
-1,     219354,     219354,     2708,    10832, 0xa410a364
 0,         75,         75,        1,   161280, 0xdbf5341c
-1,     222062,     222062,     2708,    10832, 0x2f4374b0
 0,         76,         76,        1,   161280, 0x40d5abfa
-1,     224770,     224770,     2708,    10832, 0xf41f3a07
 0,         77,         77,        1,   161280, 0x9fb8360c
-1,     227478,     227478,     2708,    10832, 0x2b1c50c6
 0,         78,         78,        1,   161280, 0xabc5fba8
-1,     230186,     230186,     2708,    10832, 0x3692ac89
 0,         79,         79,        1,   161280, 0x98090909
-1,     232894,     232894,     2708,    10832, 0x5d6bc87e
 0,         80,         80,        1,   161280, 0x9a3613bd
-1,     235602,     235602,     2708,    10832, 0x1b1cda0c
 0,         81,         81,        1,   161280, 0x9071024f
-1,     238310,     238310,     2708,    10832, 0x11eaa15f
-1,     241018,     241018,     2708,    10832, 0x73c7d7ef
 0,         82,         82,        1,   161280, 0x4df39487
-1,     243726,     243726,     2708,    10832, 0x65d7e3be
 0,         83,         83,        1,   161280, 0x17658524
-1,     246434,     246434,     2708,    10832, 0xb9c00688
 0,         84,         84,        1,   161280, 0xbcd794df
-1,     249142,     249142,     2708,    10832, 0x0b98c125
 0,         85,         85,        1,   161280, 0x2a14ae05
-1,     251850,     251850,     2708,    10832, 0x331ed413
 0,         86,         86,        1,   161280, 0x664feab2
-1,     254558,     254558,     2708,    10832, 0x9b68f485
 0,         87,         87,        1,   161280, 0xf6b721f4
-1,     257267,     257267,     2708,    10832, 0x1b865c55
 0,         88,         88,        1,   161280, 0xfec565f3
-1,     259975,     259975,     2708,    10832, 0x68cef565
 0,         89,         89,        1,   161280, 0xd39aabee
-1,     262683,     262683,     2708,    10832, 0x3a605f15
 0,         90,         90,        1,   161280, 0x1f3d5de7
-1,     265391,     265391,     2708,    10832, 0xd72ff22e
 0,         91,         91,        1,   161280, 0xaf97f50c
-1,     268099,     268099,     2708,    10832, 0x1c672b67
 0,         92,         92,        1,   161280, 0xe34b6b6a
-1,     270807,     270807,     2708,    10832, 0xfd1a7e7e
 0,         93,         93,        1,   161280, 0x4117371e
-1,     273515,     273515,     2708,    10832, 0x9bf20ead
-1,     276223,     276223,     2708,    10832, 0x00000000
 0,         94,         94,        1,   161280, 0x4117371e
-1,     278931,     278931,     2708,    10832, 0x00000000
 0,         95,         95,        1,   161280, 0xe555b55e
-1,     281639,     281639,     2708,    10832, 0x00000000
 0,         96,         96,        1,   161280, 0xe555b55e
-1,     284347,     284347,     2708,    10832, 0x00000000
 0,         97,         97,        1,   161280, 0xe555b55e
-1,     287055,     287055,     2708,    10832, 0x00000000
 0,         98,         98,        1,   161280, 0xe555b55e
-1,     289763,     289763,     2708,    10832, 0x00000000
 0,         99,         99,        1,   161280, 0xe555b55e
-1,     292471,     292471,     2708,    10832, 0x00000000
 0,        100,        100,        1,   161280, 0xe555b55e
-1,     295179,     295179,     2708,    10832, 0x00000000
 0,        101,        101,        1,   161280, 0xe555b55e
-1,     297888,     297888,     2708,    10832, 0x00000000
 0,        102,        102,        1,   161280, 0xe555b55e
-1,     300596,     300596,     2708,    10832, 0x00000000
 0,        103,        103,        1,   161280, 0xe555b55e
-1,     303304,     303304,     2708,    10832, 0x00000000
 0,        104,        104,        1,   161280, 0xe555b55e