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

diff --git a/tests/ref/fate/qtrle-2bit b/tests/ref/fate/qtrle-2bit
index 4b93d8730c..95c0f7c391 100644
--- a/tests/ref/fate/qtrle-2bit
+++ b/tests/ref/fate/qtrle-2bit
@@ -1,109 +1,39 @@
 #tb 0: 1/12
-#tb 1: 1/22050
 0,          0,          0,        1,   230400, 0xb1ee55dc
-1,          0,          0,     1020,     2040, 0x0a157db4
-1,       1020,       1020,     1020,     2040, 0x00c63e08
 0,          1,          1,        1,   230400, 0x97c580bf
-1,       2040,       2040,     1020,     2040, 0xacf2a25b
-1,       3060,       3060,     1020,     2040, 0xd6189e85
 0,          2,          2,        1,   230400, 0xd4bd57e8
-1,       4080,       4080,     1020,     2040, 0x8276f843
-1,       5100,       5100,     1020,     2040, 0xadebae73
 0,          3,          3,        1,   230400, 0x412b79aa
-1,       6120,       6120,     1020,     2040, 0x5da76697
-1,       7140,       7140,     1020,     2040, 0x469d0ea7
 0,          4,          4,        1,   230400, 0x928a44d1
-1,       8160,       8160,     1020,     2040, 0x0d7412e1
-1,       9180,       9180,     1020,     2040, 0x2f2cc63f
 0,          5,          5,        1,   230400, 0x6bbdc0e4
-1,      10200,      10200,     1020,     2040, 0x10106eb7
 0,          6,          6,        1,   230400, 0x382e960f
-1,      11220,      11220,     1020,     2040, 0x300124c7
-1,      12240,      12240,     1020,     2040, 0xa329f8e8
 0,          7,          7,        1,   230400, 0x62c863ea
-1,      13260,      13260,     1020,     2040, 0xcea35ca5
-1,      14280,      14280,     1020,     2040, 0x55105aef
 0,          8,          8,        1,   230400, 0xbfccd3ce
-1,      15300,      15300,     1020,     2040, 0x08980ce1
-1,      16320,      16320,     1020,     2040, 0x367faf24
 0,          9,          9,        1,   230400, 0x1987cdd4
-1,      17340,      17340,     1020,     2040, 0x75bfef06
-1,      18360,      18360,     1020,     2040, 0x34f1daf4
 0,         10,         10,        1,   230400, 0x40279727
-1,      19380,      19380,     1020,     2040, 0x97050317
 0,         11,         11,        1,   230400, 0x9d4f6746
-1,      20400,      20400,     1020,     2040, 0xd297c536
-1,      21420,      21420,     1020,     2040, 0xa8abad5a
 0,         12,         12,        1,   230400, 0x7b8a77ec
-1,      22440,      22440,     1020,     2040, 0x445ce8e0
-1,      23460,      23460,     1020,     2040, 0xa3f4d940
 0,         13,         13,        1,   230400, 0x2ce7a781
-1,      24480,      24480,     1020,     2040, 0x0ebb7b26
-1,      25500,      25500,     1020,     2040, 0x4372f6f6
 0,         14,         14,        1,   230400, 0xb749815e
-1,      26520,      26520,     1020,     2040, 0xd4365079
-1,      27540,      27540,     1020,     2040, 0x56f902f7
 0,         15,         15,        1,   230400, 0x61c88610
-1,      28560,      28560,     1020,     2040, 0x4153938a
 0,         16,         16,        1,   230400, 0x8449114d
-1,      29580,      29580,     1020,     2040, 0x14996d86
-1,      30600,      30600,     1020,     2040, 0x3f99c318
 0,         17,         17,        1,   230400, 0x5f73e666
-1,      31620,      31620,     1020,     2040, 0x939978a5
-1,      32640,      32640,     1020,     2040, 0x7086bd44
 0,         18,         18,        1,   230400, 0xbde53ce6
-1,      33660,      33660,      138,      276, 0x25b89d22
-1,      33798,      33798,     1020,     2040, 0xf3edb106
-1,      34818,      34818,     1020,     2040, 0x0ca61430
 0,         19,         19,        1,   230400, 0x8c7406fd
-1,      35838,      35838,     1020,     2040, 0x7229c458
 0,         20,         20,        1,   230400, 0xf9e9a3ef
-1,      36858,      36858,     1020,     2040, 0xc37edd31
-1,      37878,      37878,     1020,     2040, 0xa3da98b4
 0,         21,         21,        1,   230400, 0x7e0a3077
-1,      38898,      38898,     1020,     2040, 0x69704803
-1,      39918,      39918,     1020,     2040, 0xa79bf334
 0,         22,         22,        1,   230400, 0xd9245c5f
-1,      40938,      40938,     1020,     2040, 0x59d8d4c4
-1,      41958,      41958,     1020,     2040, 0xf9ff0271
 0,         23,         23,        1,   230400, 0x6d077ea2
-1,      42978,      42978,     1020,     2040, 0xc4ced9d6
-1,      43998,      43998,     1020,     2040, 0x859f1912
 0,         24,         24,        1,   230400, 0xf622bb2a
-1,      45018,      45018,     1020,     2040, 0xe7955aa6
 0,         25,         25,        1,   230400, 0x35292dc8
-1,      46038,      46038,     1020,     2040, 0x374624fd
-1,      47058,      47058,     1020,     2040, 0x52121097
 0,         26,         26,        1,   230400, 0xc0cea946
-1,      48078,      48078,     1020,     2040, 0x660fe645
-1,      49098,      49098,     1020,     2040, 0xf624176a
 0,         27,         27,        1,   230400, 0x98b27b60
-1,      50118,      50118,     1020,     2040, 0x1f2246dd
-1,      51138,      51138,     1020,     2040, 0x940e0a32
 0,         28,         28,        1,   230400, 0x668ef6bd
-1,      52158,      52158,     1020,     2040, 0x9c6d338c
-1,      53178,      53178,     1020,     2040, 0xfce0d30a
 0,         29,         29,        1,   230400, 0x6c07a31c
-1,      54198,      54198,     1020,     2040, 0xd0ec9aa5
 0,         30,         30,        1,   230400, 0x0b4a6ae1
-1,      55218,      55218,     1020,     2040, 0x58012141
-1,      56238,      56238,     1020,     2040, 0xde67fc43
 0,         31,         31,        1,   230400, 0x945b9878
-1,      57258,      57258,     1020,     2040, 0x6baa0450
-1,      58278,      58278,     1020,     2040, 0xf4f80252
 0,         32,         32,        1,   230400, 0xab28031c
-1,      59298,      59298,     1020,     2040, 0x0cd47ee3
-1,      60318,      60318,     1020,     2040, 0x129cbaa7
 0,         33,         33,        1,   230400, 0x977252b0
-1,      61338,      61338,     1020,     2040, 0x5ef5c0a1
-1,      62358,      62358,     1020,     2040, 0xf660baa7
 0,         34,         34,        1,   230400, 0x6c3d9706
-1,      63378,      63378,     1020,     2040, 0xe48bc0a1
 0,         35,         35,        1,   230400, 0xe053bc2a
-1,      64398,      64398,     1020,     2040, 0xdfeabaa7
-1,      65418,      65418,     1020,     2040, 0xed04c0a1
 0,         36,         36,        1,   230400, 0x4cf2fc7c
-1,      66438,      66438,     1020,     2040, 0xd771baa7
-1,      67458,      67458,      150,      300, 0x521f24e9
-1,      67608,      67608,      738,     1476, 0x9b9394b1
 0,         37,         37,        1,   230400, 0x610beda7