Merge remote-tracking branch 'qatar/master'

* qatar/master:
  dsputil: remove debug message in dsputil_init().
  movdec: Avoid av_malloc(0) in stss
  build: Drop YASM-OBJS-FFT from SUBDIR_VARS.
  build: Drop unused X86-OBJS variable.
  avconv: remove debugging cruft from do_video_out().
  avconv: factorize setting stream_index for the output packet.
  frame{crc/md5}: set the stream timebase from codec timebase.
  apedec: remove unneeded #include of get_bits.h and associated macro
  apedec: av_fast_malloc() instead of av_realloc()
  apedec: fix handling of packet sizes that are not a multiple of 4 bytes

Conflicts:
	libavcodec/apedec.c
	tests/ref/fate/4xm-1
	tests/ref/fate/4xm-2
	tests/ref/fate/aasc
	tests/ref/fate/armovie-escape124
	tests/ref/fate/bethsoft-vid
	tests/ref/fate/cljr
	tests/ref/fate/creatureshock-avs
	tests/ref/fate/cscd
	tests/ref/fate/cvid-partial
	tests/ref/fate/deluxepaint-anm
	tests/ref/fate/dfa1
	tests/ref/fate/dfa10
	tests/ref/fate/dfa11
	tests/ref/fate/dfa2
	tests/ref/fate/dfa3
	tests/ref/fate/dfa4
	tests/ref/fate/dfa5
	tests/ref/fate/dfa6
	tests/ref/fate/dfa7
	tests/ref/fate/dfa8
	tests/ref/fate/dfa9
	tests/ref/fate/film-cvid-pcm-stereo-8bit
	tests/ref/fate/flic-af11-palette-change
	tests/ref/fate/flic-magiccarpet
	tests/ref/fate/fraps-v2
	tests/ref/fate/fraps-v3
	tests/ref/fate/h264-lossless
	tests/ref/fate/interplay-mve-16bit
	tests/ref/fate/interplay-mve-8bit
	tests/ref/fate/mimic
	tests/ref/fate/motionpixels
	tests/ref/fate/mpeg2-field-enc
	tests/ref/fate/msvideo1-16bit
	tests/ref/fate/mtv
	tests/ref/fate/nuv
	tests/ref/fate/pictor
	tests/ref/fate/prores-alpha
	tests/ref/fate/ptx
	tests/ref/fate/qtrle-16bit
	tests/ref/fate/qtrle-1bit
	tests/ref/fate/quickdraw
	tests/ref/fate/rpza
	tests/ref/fate/sierra-vmd
	tests/ref/fate/targa-conformance-CCM8
	tests/ref/fate/targa-conformance-UCM8
	tests/ref/fate/tiertex-seq
	tests/ref/fate/truemotion1-15
	tests/ref/fate/truemotion1-24
	tests/ref/fate/tscc-15bit
	tests/ref/fate/tscc-32bit
	tests/ref/fate/v210
	tests/ref/fate/vc1-ism
	tests/ref/fate/vc1_sa00040
	tests/ref/fate/vc1_sa00050
	tests/ref/fate/vc1_sa10091
	tests/ref/fate/vc1_sa20021
	tests/ref/fate/vmnc-16bit
	tests/ref/fate/vmnc-32bit
	tests/ref/fate/vp5
	tests/ref/fate/vp8-sign-bias
	tests/ref/fate/vqa-cc
	tests/ref/fate/wmv8-drm
	tests/ref/fate/yop
	tests/ref/fate/zmbv-8bit

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

1 files changed, 175 insertions, 174 deletions

diff --git a/tests/ref/fate/4xm-2 b/tests/ref/fate/4xm-2
index 6c69036a3b..cf71357810 100644
--- a/tests/ref/fate/4xm-2
+++ b/tests/ref/fate/4xm-2
@@ -1,174 +1,175 @@
-0, 0, 80640, 0x00000000
-0, 15000, 80640, 0x3a942680
-0, 30000, 80640, 0x3a942680
-0, 45000, 80640, 0x3a942680
-0, 60000, 80640, 0x3a942680
-0, 75000, 80640, 0x3a942680
-0, 90000, 80640, 0x3a942680
-0, 105000, 80640, 0xa731901a
-0, 120000, 80640, 0x0a1e5b3d
-0, 135000, 80640, 0x2c66418f
-0, 150000, 80640, 0xaaf8575a
-0, 165000, 80640, 0x2d1a60b1
-0, 180000, 80640, 0x646d6e66
-0, 195000, 80640, 0x090de107
-0, 210000, 80640, 0x90991f6c
-0, 225000, 80640, 0xda862969
-0, 240000, 80640, 0x5434e1ec
-0, 255000, 80640, 0x4e981ce7
-0, 270000, 80640, 0x97eb4000
-0, 285000, 80640, 0xbfb375b0
-0, 300000, 80640, 0x1529d95d
-0, 315000, 80640, 0x2c0015af
-0, 330000, 80640, 0x63779ce1
-0, 345000, 80640, 0x3f2b3949
-0, 360000, 80640, 0xe3cf3be4
-0, 375000, 80640, 0x54451a22
-0, 390000, 80640, 0xc2901d91
-0, 405000, 80640, 0x312f8b7e
-0, 420000, 80640, 0x99734f4e
-0, 435000, 80640, 0xe50b8391
-0, 450000, 80640, 0x7c6b04e4
-0, 465000, 80640, 0x04989996
-0, 480000, 80640, 0x30c3c00f
-0, 495000, 80640, 0x77172ba4
-0, 510000, 80640, 0x1257a596
-0, 525000, 80640, 0x657e5fa8
-0, 540000, 80640, 0xe66958ef
-0, 555000, 80640, 0xbf7f4f0a
-0, 570000, 80640, 0x588ac70e
-0, 585000, 80640, 0xb1a91c4b
-0, 600000, 80640, 0x5b73de24
-0, 615000, 80640, 0xa3c15e73
-0, 630000, 80640, 0x7326196b
-0, 645000, 80640, 0x1aa52b88
-0, 660000, 80640, 0x0029f511
-0, 675000, 80640, 0x2398433a
-0, 690000, 80640, 0xef9ab870
-0, 705000, 80640, 0xb1ac9b79
-0, 720000, 80640, 0x1cc2ab3b
-0, 735000, 80640, 0x41362b53
-0, 750000, 80640, 0x81e33811
-0, 765000, 80640, 0x621d285a
-0, 780000, 80640, 0x84e84c24
-0, 795000, 80640, 0xbb8c2939
-0, 810000, 80640, 0x6c6905a8
-0, 825000, 80640, 0xc60bbaf0
-0, 840000, 80640, 0xc80d08c8
-0, 855000, 80640, 0xc5646343
-0, 870000, 80640, 0x3df7a287
-0, 885000, 80640, 0x628e9f78
-0, 900000, 80640, 0x58f93044
-0, 915000, 80640, 0x8ee3a59f
-0, 930000, 80640, 0xaa297416
-0, 945000, 80640, 0x7bbd7307
-0, 960000, 80640, 0x12dbee42
-0, 975000, 80640, 0xaea5fb22
-0, 990000, 80640, 0x9405fd0b
-0, 1005000, 80640, 0x59400b6f
-0, 1020000, 80640, 0x70beeba0
-0, 1035000, 80640, 0xdc0681ae
-0, 1050000, 80640, 0xe4a3c803
-0, 1065000, 80640, 0x3424c568
-0, 1080000, 80640, 0xeb72838d
-0, 1095000, 80640, 0x671fbff3
-0, 1110000, 80640, 0xa4b849bd
-0, 1125000, 80640, 0xf4c2be6f
-0, 1140000, 80640, 0xb91988fd
-0, 1155000, 80640, 0xd0e5bf3a
-0, 1170000, 80640, 0x78c2b0bc
-0, 1185000, 80640, 0xcf2deb74
-0, 1200000, 80640, 0x84a9081b
-0, 1215000, 80640, 0x9931e9b1
-0, 1230000, 80640, 0x1ce6b59d
-0, 1245000, 80640, 0x24a31152
-0, 1260000, 80640, 0x206f4677
-0, 1275000, 80640, 0x507755ab
-0, 1290000, 80640, 0xc4b5643a
-0, 1305000, 80640, 0x197445f7
-0, 1320000, 80640, 0x53232d2a
-0, 1335000, 80640, 0x33ae27d4
-0, 1350000, 80640, 0x77bb2925
-0, 1365000, 80640, 0xb0d53220
-0, 1380000, 80640, 0xacdb26fc
-0, 1395000, 80640, 0xa83d32e1
-0, 1410000, 80640, 0xe2002717
-0, 1425000, 80640, 0xb1722fed
-0, 1440000, 80640, 0xa7de3206
-0, 1455000, 80640, 0x68f94780
-0, 1470000, 80640, 0x2bcc2f28
-0, 1485000, 80640, 0xaf9354e5
-0, 1500000, 80640, 0x45b4375c
-0, 1515000, 80640, 0x60e043ee
-0, 1530000, 80640, 0x9ed5411e
-0, 1545000, 80640, 0xbae131ce
-0, 1560000, 80640, 0x33be2be6
-0, 1575000, 80640, 0xdadb3a4c
-0, 1590000, 80640, 0xe9e72559
-0, 1605000, 80640, 0x9fe93f8c
-0, 1620000, 80640, 0xc20b413a
-0, 1635000, 80640, 0x02c74699
-0, 1650000, 80640, 0x1b284634
-0, 1665000, 80640, 0xb7ea559e
-0, 1680000, 80640, 0x62e3b0e1
-0, 1695000, 80640, 0x8b6bbf68
-0, 1710000, 80640, 0x04d2e8d8
-0, 1725000, 80640, 0xc6961955
-0, 1740000, 80640, 0xf318e461
-0, 1755000, 80640, 0x55231e8f
-0, 1770000, 80640, 0x772f325e
-0, 1785000, 80640, 0x31480120
-0, 1800000, 80640, 0x5eda30fe
-0, 1815000, 80640, 0x5c534632
-0, 1830000, 80640, 0xaca0f5c9
-0, 1845000, 80640, 0x9ec83b5a
-0, 1860000, 80640, 0x65944233
-0, 1875000, 80640, 0xbf7e15f0
-0, 1890000, 80640, 0xf985f9b7
-0, 1905000, 80640, 0x0e7a0887
-0, 1920000, 80640, 0xee33931b
-0, 1935000, 80640, 0xea6b92f8
-0, 1950000, 80640, 0xde559025
-0, 1965000, 80640, 0x970c9af6
-0, 1980000, 80640, 0x6a579d8a
-0, 1995000, 80640, 0x7053ac0c
-0, 2010000, 80640, 0x6d6ca81b
-0, 2025000, 80640, 0x6ffdb338
-0, 2040000, 80640, 0x402f953f
-0, 2055000, 80640, 0x24358c04
-0, 2070000, 80640, 0x26298a25
-0, 2085000, 80640, 0xbc0487e7
-0, 2100000, 80640, 0xf8c885fd
-0, 2115000, 80640, 0x98a79695
-0, 2130000, 80640, 0x846aa04b
-0, 2145000, 80640, 0x22ba919b
-0, 2160000, 80640, 0xcba08a11
-0, 2175000, 80640, 0xfba0836c
-0, 2190000, 80640, 0xb7ff8059
-0, 2205000, 80640, 0xb15080bb
-0, 2220000, 80640, 0x42627aed
-0, 2235000, 80640, 0xd045d485
-0, 2250000, 80640, 0xf22e7545
-0, 2265000, 80640, 0xe24a41fc
-0, 2280000, 80640, 0x854696ac
-0, 2295000, 80640, 0x6722f8f2
-0, 2310000, 80640, 0x00000000
-0, 2325000, 80640, 0x0f412500
-0, 2340000, 80640, 0x0f412500
-0, 2355000, 80640, 0x0f412500
-0, 2370000, 80640, 0xb6634270
-0, 2385000, 80640, 0x9e43a4a0
-0, 2400000, 80640, 0x136ab60b
-0, 2415000, 80640, 0xe43625dc
-0, 2430000, 80640, 0xc2eb0f8c
-0, 2445000, 80640, 0x99af167d
-0, 2460000, 80640, 0xd9cb0a37
-0, 2475000, 80640, 0x1f2cf2ce
-0, 2490000, 80640, 0x00eeae7f
-0, 2505000, 80640, 0xcc1d666c
-0, 2520000, 80640, 0x77d6fcc9
-0, 2535000, 80640, 0x58c8acc6
-0, 2550000, 80640, 0xd026238d
-0, 2565000, 80640, 0xfefb6c9b
-0, 2580000, 80640, 0xa9a5cb36
-0, 2595000, 80640, 0xc845f000
+#tb 0: 1/6
+0,          0,          0,        1,    80640, 0x00000000
+0,          1,          1,        1,    80640, 0x3a942680
+0,          2,          2,        1,    80640, 0x3a942680
+0,          3,          3,        1,    80640, 0x3a942680
+0,          4,          4,        1,    80640, 0x3a942680
+0,          5,          5,        1,    80640, 0x3a942680
+0,          6,          6,        1,    80640, 0x3a942680
+0,          7,          7,        1,    80640, 0xa731901a
+0,          8,          8,        1,    80640, 0x0a1e5b3d
+0,          9,          9,        1,    80640, 0x2c66418f
+0,         10,         10,        1,    80640, 0xaaf8575a
+0,         11,         11,        1,    80640, 0x2d1a60b1
+0,         12,         12,        1,    80640, 0x646d6e66
+0,         13,         13,        1,    80640, 0x090de107
+0,         14,         14,        1,    80640, 0x90991f6c
+0,         15,         15,        1,    80640, 0xda862969
+0,         16,         16,        1,    80640, 0x5434e1ec
+0,         17,         17,        1,    80640, 0x4e981ce7
+0,         18,         18,        1,    80640, 0x97eb4000
+0,         19,         19,        1,    80640, 0xbfb375b0
+0,         20,         20,        1,    80640, 0x1529d95d
+0,         21,         21,        1,    80640, 0x2c0015af
+0,         22,         22,        1,    80640, 0x63779ce1
+0,         23,         23,        1,    80640, 0x3f2b3949
+0,         24,         24,        1,    80640, 0xe3cf3be4
+0,         25,         25,        1,    80640, 0x54451a22
+0,         26,         26,        1,    80640, 0xc2901d91
+0,         27,         27,        1,    80640, 0x312f8b7e
+0,         28,         28,        1,    80640, 0x99734f4e
+0,         29,         29,        1,    80640, 0xe50b8391
+0,         30,         30,        1,    80640, 0x7c6b04e4
+0,         31,         31,        1,    80640, 0x04989996
+0,         32,         32,        1,    80640, 0x30c3c00f
+0,         33,         33,        1,    80640, 0x77172ba4
+0,         34,         34,        1,    80640, 0x1257a596
+0,         35,         35,        1,    80640, 0x657e5fa8
+0,         36,         36,        1,    80640, 0xe66958ef
+0,         37,         37,        1,    80640, 0xbf7f4f0a
+0,         38,         38,        1,    80640, 0x588ac70e
+0,         39,         39,        1,    80640, 0xb1a91c4b
+0,         40,         40,        1,    80640, 0x5b73de24
+0,         41,         41,        1,    80640, 0xa3c15e73
+0,         42,         42,        1,    80640, 0x7326196b
+0,         43,         43,        1,    80640, 0x1aa52b88
+0,         44,         44,        1,    80640, 0x0029f511
+0,         45,         45,        1,    80640, 0x2398433a
+0,         46,         46,        1,    80640, 0xef9ab870
+0,         47,         47,        1,    80640, 0xb1ac9b79
+0,         48,         48,        1,    80640, 0x1cc2ab3b
+0,         49,         49,        1,    80640, 0x41362b53
+0,         50,         50,        1,    80640, 0x81e33811
+0,         51,         51,        1,    80640, 0x621d285a
+0,         52,         52,        1,    80640, 0x84e84c24
+0,         53,         53,        1,    80640, 0xbb8c2939
+0,         54,         54,        1,    80640, 0x6c6905a8
+0,         55,         55,        1,    80640, 0xc60bbaf0
+0,         56,         56,        1,    80640, 0xc80d08c8
+0,         57,         57,        1,    80640, 0xc5646343
+0,         58,         58,        1,    80640, 0x3df7a287
+0,         59,         59,        1,    80640, 0x628e9f78
+0,         60,         60,        1,    80640, 0x58f93044
+0,         61,         61,        1,    80640, 0x8ee3a59f
+0,         62,         62,        1,    80640, 0xaa297416
+0,         63,         63,        1,    80640, 0x7bbd7307
+0,         64,         64,        1,    80640, 0x12dbee42
+0,         65,         65,        1,    80640, 0xaea5fb22
+0,         66,         66,        1,    80640, 0x9405fd0b
+0,         67,         67,        1,    80640, 0x59400b6f
+0,         68,         68,        1,    80640, 0x70beeba0
+0,         69,         69,        1,    80640, 0xdc0681ae
+0,         70,         70,        1,    80640, 0xe4a3c803
+0,         71,         71,        1,    80640, 0x3424c568
+0,         72,         72,        1,    80640, 0xeb72838d
+0,         73,         73,        1,    80640, 0x671fbff3
+0,         74,         74,        1,    80640, 0xa4b849bd
+0,         75,         75,        1,    80640, 0xf4c2be6f
+0,         76,         76,        1,    80640, 0xb91988fd
+0,         77,         77,        1,    80640, 0xd0e5bf3a
+0,         78,         78,        1,    80640, 0x78c2b0bc
+0,         79,         79,        1,    80640, 0xcf2deb74
+0,         80,         80,        1,    80640, 0x84a9081b
+0,         81,         81,        1,    80640, 0x9931e9b1
+0,         82,         82,        1,    80640, 0x1ce6b59d
+0,         83,         83,        1,    80640, 0x24a31152
+0,         84,         84,        1,    80640, 0x206f4677
+0,         85,         85,        1,    80640, 0x507755ab
+0,         86,         86,        1,    80640, 0xc4b5643a
+0,         87,         87,        1,    80640, 0x197445f7
+0,         88,         88,        1,    80640, 0x53232d2a
+0,         89,         89,        1,    80640, 0x33ae27d4
+0,         90,         90,        1,    80640, 0x77bb2925
+0,         91,         91,        1,    80640, 0xb0d53220
+0,         92,         92,        1,    80640, 0xacdb26fc
+0,         93,         93,        1,    80640, 0xa83d32e1
+0,         94,         94,        1,    80640, 0xe2002717
+0,         95,         95,        1,    80640, 0xb1722fed
+0,         96,         96,        1,    80640, 0xa7de3206
+0,         97,         97,        1,    80640, 0x68f94780
+0,         98,         98,        1,    80640, 0x2bcc2f28
+0,         99,         99,        1,    80640, 0xaf9354e5
+0,        100,        100,        1,    80640, 0x45b4375c
+0,        101,        101,        1,    80640, 0x60e043ee
+0,        102,        102,        1,    80640, 0x9ed5411e
+0,        103,        103,        1,    80640, 0xbae131ce
+0,        104,        104,        1,    80640, 0x33be2be6
+0,        105,        105,        1,    80640, 0xdadb3a4c
+0,        106,        106,        1,    80640, 0xe9e72559
+0,        107,        107,        1,    80640, 0x9fe93f8c
+0,        108,        108,        1,    80640, 0xc20b413a
+0,        109,        109,        1,    80640, 0x02c74699
+0,        110,        110,        1,    80640, 0x1b284634
+0,        111,        111,        1,    80640, 0xb7ea559e
+0,        112,        112,        1,    80640, 0x62e3b0e1
+0,        113,        113,        1,    80640, 0x8b6bbf68
+0,        114,        114,        1,    80640, 0x04d2e8d8
+0,        115,        115,        1,    80640, 0xc6961955
+0,        116,        116,        1,    80640, 0xf318e461
+0,        117,        117,        1,    80640, 0x55231e8f
+0,        118,        118,        1,    80640, 0x772f325e
+0,        119,        119,        1,    80640, 0x31480120
+0,        120,        120,        1,    80640, 0x5eda30fe
+0,        121,        121,        1,    80640, 0x5c534632
+0,        122,        122,        1,    80640, 0xaca0f5c9
+0,        123,        123,        1,    80640, 0x9ec83b5a
+0,        124,        124,        1,    80640, 0x65944233
+0,        125,        125,        1,    80640, 0xbf7e15f0
+0,        126,        126,        1,    80640, 0xf985f9b7
+0,        127,        127,        1,    80640, 0x0e7a0887
+0,        128,        128,        1,    80640, 0xee33931b
+0,        129,        129,        1,    80640, 0xea6b92f8
+0,        130,        130,        1,    80640, 0xde559025
+0,        131,        131,        1,    80640, 0x970c9af6
+0,        132,        132,        1,    80640, 0x6a579d8a
+0,        133,        133,        1,    80640, 0x7053ac0c
+0,        134,        134,        1,    80640, 0x6d6ca81b
+0,        135,        135,        1,    80640, 0x6ffdb338
+0,        136,        136,        1,    80640, 0x402f953f
+0,        137,        137,        1,    80640, 0x24358c04
+0,        138,        138,        1,    80640, 0x26298a25
+0,        139,        139,        1,    80640, 0xbc0487e7
+0,        140,        140,        1,    80640, 0xf8c885fd
+0,        141,        141,        1,    80640, 0x98a79695
+0,        142,        142,        1,    80640, 0x846aa04b
+0,        143,        143,        1,    80640, 0x22ba919b
+0,        144,        144,        1,    80640, 0xcba08a11
+0,        145,        145,        1,    80640, 0xfba0836c
+0,        146,        146,        1,    80640, 0xb7ff8059
+0,        147,        147,        1,    80640, 0xb15080bb
+0,        148,        148,        1,    80640, 0x42627aed
+0,        149,        149,        1,    80640, 0xd045d485
+0,        150,        150,        1,    80640, 0xf22e7545
+0,        151,        151,        1,    80640, 0xe24a41fc
+0,        152,        152,        1,    80640, 0x854696ac
+0,        153,        153,        1,    80640, 0x6722f8f2
+0,        154,        154,        1,    80640, 0x00000000
+0,        155,        155,        1,    80640, 0x0f412500
+0,        156,        156,        1,    80640, 0x0f412500
+0,        157,        157,        1,    80640, 0x0f412500
+0,        158,        158,        1,    80640, 0xb6634270
+0,        159,        159,        1,    80640, 0x9e43a4a0
+0,        160,        160,        1,    80640, 0x136ab60b
+0,        161,        161,        1,    80640, 0xe43625dc
+0,        162,        162,        1,    80640, 0xc2eb0f8c
+0,        163,        163,        1,    80640, 0x99af167d
+0,        164,        164,        1,    80640, 0xd9cb0a37
+0,        165,        165,        1,    80640, 0x1f2cf2ce
+0,        166,        166,        1,    80640, 0x00eeae7f
+0,        167,        167,        1,    80640, 0xcc1d666c
+0,        168,        168,        1,    80640, 0x77d6fcc9
+0,        169,        169,        1,    80640, 0x58c8acc6
+0,        170,        170,        1,    80640, 0xd026238d
+0,        171,        171,        1,    80640, 0xfefb6c9b
+0,        172,        172,        1,    80640, 0xa9a5cb36
+0,        173,        173,        1,    80640, 0xc845f000