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, 80 deletions

diff --git a/tests/ref/fate/interplay-mve-16bit b/tests/ref/fate/interplay-mve-16bit
index 86a1911df5..b20e998857 100644
--- a/tests/ref/fate/interplay-mve-16bit
+++ b/tests/ref/fate/interplay-mve-16bit
@@ -1,131 +1,51 @@
 #tb 0: 417/12500
-#tb 1: 1/44100
 0,          0,          0,        1,   614400, 0x00000000
-1,          0,          0,     1447,     5788, 0x916d2db8
-1,       1447,       1447,     1472,     5888, 0xc65cb069
 0,          1,          1,        1,   614400, 0x00000000
-1,       2919,       2919,     1472,     5888, 0xd8ec1acc
 0,          2,          2,        1,   614400, 0x3c4ce011
-1,       4391,       4391,     1472,     5888, 0xb22af0d6
 0,          3,          3,        1,   614400, 0x16e83922
-1,       5863,       5863,     1472,     5888, 0x86bb50d9
 0,          4,          4,        1,   614400, 0x657a3d4d
-1,       7335,       7335,     1472,     5888, 0x7674d923
 0,          5,          5,        1,   614400, 0x933a08b0
-1,       8807,       8807,     1472,     5888, 0xb97c5500
 0,          6,          6,        1,   614400, 0xfcd5f76e
-1,      10279,      10279,     1472,     5888, 0xecea1249
 0,          7,          7,        1,   614400, 0xd0990cf8
-1,      11751,      11751,     1472,     5888, 0x0f4fea81
 0,          8,          8,        1,   614400, 0x02131686
-1,      13223,      13223,     1472,     5888, 0x997914d8
 0,          9,          9,        1,   614400, 0x4cf53656
-1,      14695,      14695,     1472,     5888, 0xd012f03a
 0,         10,         10,        1,   614400, 0x7d1960c0
-1,      16167,      16167,     1472,     5888, 0x03fd5248
 0,         11,         11,        1,   614400, 0x5d9f696f
-1,      17639,      17639,     1472,     5888, 0x3041a288
 0,         12,         12,        1,   614400, 0x54e06663
-1,      19111,      19111,     1472,     5888, 0xe6105de1
 0,         13,         13,        1,   614400, 0x4c1eade1
-1,      20583,      20583,     1472,     5888, 0xaa38c7bd
 0,         14,         14,        1,   614400, 0x4bd3bfff
-1,      22055,      22055,     1472,     5888, 0xbfff702c
 0,         15,         15,        1,   614400, 0xab86c041
-1,      23527,      23527,     1472,     5888, 0xbe4319a3
 0,         16,         16,        1,   614400, 0xbb2bfbf4
-1,      24999,      24999,     1472,     5888, 0x2e89d262
 0,         17,         17,        1,   614400, 0x43822e15
-1,      26471,      26471,     1472,     5888, 0x10992b9c
 0,         18,         18,        1,   614400, 0x835e352c
-1,      27943,      27943,     1472,     5888, 0x972904bf
 0,         19,         19,        1,   614400, 0x72cc538f
-1,      29415,      29415,     1472,     5888, 0x0093501c
 0,         20,         20,        1,   614400, 0x20bb6e30
-1,      30887,      30887,     1472,     5888, 0x8994ad0e
 0,         21,         21,        1,   614400, 0xfb079f52
-1,      32359,      32359,     1472,     5888, 0x9db37d21
 0,         22,         22,        1,   614400, 0x759bc4d6
-1,      33831,      33831,     1472,     5888, 0xa8c7300f
 0,         23,         23,        1,   614400, 0xd116fc3b
-1,      35303,      35303,     1472,     5888, 0x1b7073b5
 0,         24,         24,        1,   614400, 0x5c06efd2
-1,      36775,      36775,     1472,     5888, 0x56ad7f7b
 0,         25,         25,        1,   614400, 0x61641ecd
-1,      38247,      38247,     1472,     5888, 0x9706a8fb
 0,         26,         26,        1,   614400, 0x6c8d48a0
-1,      39719,      39719,     1472,     5888, 0x16c9420e
 0,         27,         27,        1,   614400, 0x64725eed
-1,      41191,      41191,     1472,     5888, 0x3e11be0a
 0,         28,         28,        1,   614400, 0x88f9a8ca
-1,      42663,      42663,     1472,     5888, 0x3e534a32
 0,         29,         29,        1,   614400, 0xcf1cbcd9
-1,      44135,      44135,     1447,     5788, 0x0ffae5f4
 0,         30,         30,        1,   614400, 0x75a3ce24
-1,      45582,      45582,     1472,     5888, 0xc2018f82
 0,         31,         31,        1,   614400, 0x3bf80ce7
-1,      47054,      47054,     1472,     5888, 0x2a11f529
 0,         32,         32,        1,   614400, 0xd4011d7c
-1,      48526,      48526,     1472,     5888, 0xec282167
 0,         33,         33,        1,   614400, 0xd569716b
-1,      49998,      49998,     1472,     5888, 0xd61b5a05
 0,         34,         34,        1,   614400, 0xfd626b6b
-1,      51470,      51470,     1472,     5888, 0x61de2741
 0,         35,         35,        1,   614400, 0xc856dbaf
-1,      52942,      52942,     1472,     5888, 0x17aaff8c
 0,         36,         36,        1,   614400, 0x0e56e68e
-1,      54414,      54414,     1472,     5888, 0xd40cd7a6
 0,         37,         37,        1,   614400, 0x5b29ecc9
-1,      55886,      55886,     1472,     5888, 0x840840d4
 0,         38,         38,        1,   614400, 0xe83c0804
-1,      57358,      57358,     1472,     5888, 0x7c97ddcf
 0,         39,         39,        1,   614400, 0xebdd3d61
-1,      58830,      58830,     1472,     5888, 0xed9150f7
 0,         40,         40,        1,   614400, 0x7f4c5b56
-1,      60302,      60302,     1472,     5888, 0xbccf973e
 0,         41,         41,        1,   614400, 0xb4019155
-1,      61774,      61774,     1472,     5888, 0x74bda5ea
 0,         42,         42,        1,   614400, 0xffdda515
-1,      63246,      63246,     1472,     5888, 0xd083892a
 0,         43,         43,        1,   614400, 0x5271c695
-1,      64718,      64718,     1472,     5888, 0x16e444b2
 0,         44,         44,        1,   614400, 0x8526d3c1
-1,      66190,      66190,     1472,     5888, 0x68a9cedb
 0,         45,         45,        1,   614400, 0x5accf7a6
-1,      67662,      67662,     1472,     5888, 0x80849f36
 0,         46,         46,        1,   614400, 0x959017aa
-1,      69134,      69134,     1472,     5888, 0x63cb7df9
 0,         47,         47,        1,   614400, 0x22f450f6
-1,      70606,      70606,     1472,     5888, 0xf90f754d
 0,         48,         48,        1,   614400, 0x2e3d6f37
-1,      72078,      72078,     1472,     5888, 0x9c2c867d
 0,         49,         49,        1,   614400, 0x0db9d89f
-1,      73550,      73550,     1472,     5888, 0x337994a4
-1,      75022,      75022,     1472,     5888, 0xf354a28d
-1,      76494,      76494,     1472,     5888, 0x70933738
-1,      77966,      77966,     1472,     5888, 0x3c019219
-1,      79438,      79438,     1472,     5888, 0xe0c21295
-1,      80910,      80910,     1472,     5888, 0x21869515
-1,      82382,      82382,     1472,     5888, 0xe9b1ec7d
-1,      83854,      83854,     1472,     5888, 0x57825497
-1,      85326,      85326,     1472,     5888, 0xae02ebeb
-1,      86798,      86798,     1472,     5888, 0x0c62e14f
-1,      88270,      88270,     1447,     5788, 0x8a255f8f
-1,      89717,      89717,     1472,     5888, 0x38993359
-1,      91189,      91189,     1472,     5888, 0x390baf95
-1,      92661,      92661,     1472,     5888, 0xb72c72ea
-1,      94133,      94133,     1472,     5888, 0xbbd3c6fe
-1,      95605,      95605,     1472,     5888, 0xefb26f0a
-1,      97077,      97077,     1472,     5888, 0xcc404dd0
-1,      98549,      98549,     1472,     5888, 0xffa23082
-1,     100021,     100021,     1472,     5888, 0xd0c43567
-1,     101493,     101493,     1472,     5888, 0x4d3b7958
-1,     102965,     102965,     1472,     5888, 0x47125aa1
-1,     104437,     104437,     1472,     5888, 0x99286cf3
-1,     105909,     105909,     1472,     5888, 0x478d61e2
-1,     107381,     107381,     1472,     5888, 0xac65b47e
-1,     108853,     108853,     1472,     5888, 0x333c1d1a
-1,     110325,     110325,     1472,     5888, 0x8f960ecf
-1,     111797,     111797,     1472,     5888, 0x58f76aec
-1,     113269,     113269,     1472,     5888, 0xb5e0dded
-1,     114741,     114741,     1472,     5888, 0xaf1a8f9a