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, 160 insertions, 159 deletions

diff --git a/tests/ref/fate/zmbv-32bit b/tests/ref/fate/zmbv-32bit
index 4b961cc370..e1df12361a 100644
--- a/tests/ref/fate/zmbv-32bit
+++ b/tests/ref/fate/zmbv-32bit
@@ -1,159 +1,160 @@
-0, 0, 192000, 0x3ac10e8e
-0, 14193, 192000, 0xb772ee57
-0, 28385, 192000, 0x9b6e648a
-0, 42578, 192000, 0x3d9c33e3
-0, 56770, 192000, 0x006db76d
-0, 70963, 192000, 0x006db76d
-0, 85155, 192000, 0x006db76d
-0, 99348, 192000, 0x006db76d
-0, 113540, 192000, 0x006db76d
-0, 127733, 192000, 0x006db76d
-0, 141925, 192000, 0x006db76d
-0, 156118, 192000, 0x006db76d
-0, 170310, 192000, 0x006db76d
-0, 184503, 192000, 0x006db76d
-0, 198695, 192000, 0x006db76d
-0, 212888, 192000, 0x7b9b28fb
-0, 227080, 192000, 0x7b9b28fb
-0, 241273, 192000, 0x7b9b28fb
-0, 255466, 192000, 0x7b9b28fb
-0, 269658, 192000, 0x7b9b28fb
-0, 283851, 192000, 0x7b9b28fb
-0, 298043, 192000, 0x67be3519
-0, 312236, 192000, 0x67be3519
-0, 326428, 192000, 0x67be3519
-0, 340621, 192000, 0x67be3519
-0, 354813, 192000, 0x67be3519
-0, 369006, 192000, 0x2ece70dd
-0, 383198, 192000, 0x2ece70dd
-0, 397391, 192000, 0x2ece70dd
-0, 411583, 192000, 0x2ece70dd
-0, 425776, 192000, 0x2ece70dd
-0, 439968, 192000, 0x2ece70dd
-0, 454161, 192000, 0xd3a382cb
-0, 468353, 192000, 0xd3a382cb
-0, 482546, 192000, 0xd3a382cb
-0, 496739, 192000, 0xd3a382cb
-0, 510931, 192000, 0xd3a382cb
-0, 525124, 192000, 0xd3a382cb
-0, 539316, 192000, 0x2d3d7fce
-0, 553509, 192000, 0x2d3d7fce
-0, 567701, 192000, 0x2d3d7fce
-0, 581894, 192000, 0x2d3d7fce
-0, 596086, 192000, 0x2d3d7fce
-0, 610279, 192000, 0x36fd52fb
-0, 624471, 192000, 0x36fd52fb
-0, 638664, 192000, 0x36fd52fb
-0, 652856, 192000, 0x36fd52fb
-0, 667049, 192000, 0x36fd52fb
-0, 681241, 192000, 0x36fd52fb
-0, 695434, 192000, 0xa38e9ab3
-0, 709627, 192000, 0x57095eef
-0, 723819, 192000, 0x5c4f4d01
-0, 738012, 192000, 0xac20321c
-0, 752204, 192000, 0x7e370e40
-0, 766397, 192000, 0xe9d92925
-0, 780589, 192000, 0xfef4d26d
-0, 794782, 192000, 0x77a4ab94
-0, 808974, 192000, 0x802fb18e
-0, 823167, 192000, 0xce968db2
-0, 837359, 192000, 0x21e6ab94
-0, 851552, 192000, 0x309d45fa
-0, 865744, 192000, 0x5d193709
-0, 879937, 192000, 0x72190d33
-0, 894129, 192000, 0xdaed162a
-0, 908322, 192000, 0x2fcaf23f
-0, 922514, 192000, 0x8986d45d
-0, 936707, 192000, 0xcf7de34e
-0, 950900, 192000, 0x22390d33
-0, 965092, 192000, 0x4b29132d
-0, 979285, 192000, 0xbffe1f21
-0, 993477, 192000, 0xa4eee34e
-0, 1007670, 192000, 0xe85ae64b
-0, 1021862, 192000, 0xb7bef23f
-0, 1036055, 192000, 0x05ab1927
-0, 1050247, 192000, 0x915f6cd3
-0, 1064440, 192000, 0x524d69d6
-0, 1078632, 192000, 0x62da78c7
-0, 1092825, 192000, 0xbf6f84bb
-0, 1107017, 192000, 0xbe9f6cd3
-0, 1121210, 192000, 0x80d0132d
-0, 1135402, 192000, 0x0789251b
-0, 1149595, 192000, 0xba1a1f21
-0, 1163787, 192000, 0x542b42fd
-0, 1177980, 192000, 0x0ff951ee
-0, 1192173, 192000, 0x785048f7
-0, 1206365, 192000, 0x5a50251b
-0, 1220558, 192000, 0xd5d73a06
-0, 1234750, 192000, 0x7a3a54eb
-0, 1248943, 192000, 0x1e2b5de2
-0, 1263135, 192000, 0xeac542fd
-0, 1277328, 192000, 0x897a1f21
-0, 1291520, 192000, 0x61602b15
-0, 1305713, 192000, 0xb12f221e
-0, 1319905, 192000, 0x08541f21
-0, 1334098, 192000, 0xeebd251b
-0, 1348290, 192000, 0xc1132e12
-0, 1362483, 192000, 0x99642818
-0, 1376675, 192000, 0x9b8e162a
-0, 1390868, 192000, 0x21b81f21
-0, 1405060, 192000, 0x1abd1030
-0, 1419253, 192000, 0x0d613d03
-0, 1433446, 192000, 0xcb32132d
-0, 1447638, 192000, 0xc680162a
-0, 1461831, 192000, 0x8dea2818
-0, 1476023, 192000, 0x3c4e1927
-0, 1490216, 192000, 0xed733709
-0, 1504408, 192000, 0xf4051c24
-0, 1518601, 192000, 0xb8eb221e
-0, 1532793, 192000, 0x1a412818
-0, 1546986, 192000, 0x6ee6162a
-0, 1561178, 192000, 0xe1a248f7
-0, 1575371, 192000, 0xc2c2221e
-0, 1589563, 192000, 0x7fdf1f21
-0, 1603756, 192000, 0x85bc251b
-0, 1617948, 192000, 0xe77c251b
-0, 1632141, 192000, 0x8789340c
-0, 1646334, 192000, 0xb6014000
-0, 1660526, 192000, 0xaa9542fd
-0, 1674719, 192000, 0x36ce54eb
-0, 1688911, 192000, 0xd1324ef1
-0, 1703104, 192000, 0x0ade60df
-0, 1717296, 192000, 0xfac56cd3
-0, 1731489, 192000, 0x00000000
-0, 1745681, 192000, 0x00000000
-0, 1759874, 192000, 0xc61c026a
-0, 1774066, 192000, 0x60810842
-0, 1788259, 192000, 0x65081393
-0, 1802451, 192000, 0xc806209f
-0, 1816644, 192000, 0x53aa32cb
-0, 1830836, 192000, 0x176546ef
-0, 1845029, 192000, 0x4e095d0e
-0, 1859221, 192000, 0xf74b7774
-0, 1873414, 192000, 0x32809306
-0, 1887607, 192000, 0x5219ae81
-0, 1901799, 192000, 0x3badcc40
-0, 1915992, 192000, 0x1387ea5d
-0, 1930184, 192000, 0xe0c606f0
-0, 1944377, 192000, 0x106f2197
-0, 1958569, 192000, 0xfe2139cf
-0, 1972762, 192000, 0x907d4f0a
-0, 1986954, 192000, 0x04415dad
-0, 2001147, 192000, 0xe0b864b6
-0, 2015339, 192000, 0xcb2a64b8
-0, 2029532, 192000, 0xcb2a64b8
-0, 2043724, 192000, 0xcb2a64b8
-0, 2057917, 192000, 0xcb2a64b8
-0, 2072109, 192000, 0xcb2a64b8
-0, 2086302, 192000, 0xcb2a64b8
-0, 2100494, 192000, 0xcb2a64b8
-0, 2114687, 192000, 0xcb2a64b8
-0, 2128880, 192000, 0xcb2a64b8
-0, 2143072, 192000, 0xcb2a64b8
-0, 2157265, 192000, 0xcb2a64b8
-0, 2171457, 192000, 0xcb2a64b8
-0, 2185650, 192000, 0xcb2a64b8
-0, 2199842, 192000, 0xcb2a64b8
-0, 2214035, 192000, 0xcb2a64b8
-0, 2228227, 192000, 0xcb2a64b8
-0, 2242420, 192000, 0xcb2a64b8
+#tb 0: 250000/1585341
+0,          0,          0,        1,   192000, 0x3ac10e8e
+0,          1,          1,        1,   192000, 0xb772ee57
+0,          2,          2,        1,   192000, 0x9b6e648a
+0,          3,          3,        1,   192000, 0x3d9c33e3
+0,          4,          4,        1,   192000, 0x006db76d
+0,          5,          5,        1,   192000, 0x006db76d
+0,          6,          6,        1,   192000, 0x006db76d
+0,          7,          7,        1,   192000, 0x006db76d
+0,          8,          8,        1,   192000, 0x006db76d
+0,          9,          9,        1,   192000, 0x006db76d
+0,         10,         10,        1,   192000, 0x006db76d
+0,         11,         11,        1,   192000, 0x006db76d
+0,         12,         12,        1,   192000, 0x006db76d
+0,         13,         13,        1,   192000, 0x006db76d
+0,         14,         14,        1,   192000, 0x006db76d
+0,         15,         15,        1,   192000, 0x7b9b28fb
+0,         16,         16,        1,   192000, 0x7b9b28fb
+0,         17,         17,        1,   192000, 0x7b9b28fb
+0,         18,         18,        1,   192000, 0x7b9b28fb
+0,         19,         19,        1,   192000, 0x7b9b28fb
+0,         20,         20,        1,   192000, 0x7b9b28fb
+0,         21,         21,        1,   192000, 0x67be3519
+0,         22,         22,        1,   192000, 0x67be3519
+0,         23,         23,        1,   192000, 0x67be3519
+0,         24,         24,        1,   192000, 0x67be3519
+0,         25,         25,        1,   192000, 0x67be3519
+0,         26,         26,        1,   192000, 0x2ece70dd
+0,         27,         27,        1,   192000, 0x2ece70dd
+0,         28,         28,        1,   192000, 0x2ece70dd
+0,         29,         29,        1,   192000, 0x2ece70dd
+0,         30,         30,        1,   192000, 0x2ece70dd
+0,         31,         31,        1,   192000, 0x2ece70dd
+0,         32,         32,        1,   192000, 0xd3a382cb
+0,         33,         33,        1,   192000, 0xd3a382cb
+0,         34,         34,        1,   192000, 0xd3a382cb
+0,         35,         35,        1,   192000, 0xd3a382cb
+0,         36,         36,        1,   192000, 0xd3a382cb
+0,         37,         37,        1,   192000, 0xd3a382cb
+0,         38,         38,        1,   192000, 0x2d3d7fce
+0,         39,         39,        1,   192000, 0x2d3d7fce
+0,         40,         40,        1,   192000, 0x2d3d7fce
+0,         41,         41,        1,   192000, 0x2d3d7fce
+0,         42,         42,        1,   192000, 0x2d3d7fce
+0,         43,         43,        1,   192000, 0x36fd52fb
+0,         44,         44,        1,   192000, 0x36fd52fb
+0,         45,         45,        1,   192000, 0x36fd52fb
+0,         46,         46,        1,   192000, 0x36fd52fb
+0,         47,         47,        1,   192000, 0x36fd52fb
+0,         48,         48,        1,   192000, 0x36fd52fb
+0,         49,         49,        1,   192000, 0xa38e9ab3
+0,         50,         50,        1,   192000, 0x57095eef
+0,         51,         51,        1,   192000, 0x5c4f4d01
+0,         52,         52,        1,   192000, 0xac20321c
+0,         53,         53,        1,   192000, 0x7e370e40
+0,         54,         54,        1,   192000, 0xe9d92925
+0,         55,         55,        1,   192000, 0xfef4d26d
+0,         56,         56,        1,   192000, 0x77a4ab94
+0,         57,         57,        1,   192000, 0x802fb18e
+0,         58,         58,        1,   192000, 0xce968db2
+0,         59,         59,        1,   192000, 0x21e6ab94
+0,         60,         60,        1,   192000, 0x309d45fa
+0,         61,         61,        1,   192000, 0x5d193709
+0,         62,         62,        1,   192000, 0x72190d33
+0,         63,         63,        1,   192000, 0xdaed162a
+0,         64,         64,        1,   192000, 0x2fcaf23f
+0,         65,         65,        1,   192000, 0x8986d45d
+0,         66,         66,        1,   192000, 0xcf7de34e
+0,         67,         67,        1,   192000, 0x22390d33
+0,         68,         68,        1,   192000, 0x4b29132d
+0,         69,         69,        1,   192000, 0xbffe1f21
+0,         70,         70,        1,   192000, 0xa4eee34e
+0,         71,         71,        1,   192000, 0xe85ae64b
+0,         72,         72,        1,   192000, 0xb7bef23f
+0,         73,         73,        1,   192000, 0x05ab1927
+0,         74,         74,        1,   192000, 0x915f6cd3
+0,         75,         75,        1,   192000, 0x524d69d6
+0,         76,         76,        1,   192000, 0x62da78c7
+0,         77,         77,        1,   192000, 0xbf6f84bb
+0,         78,         78,        1,   192000, 0xbe9f6cd3
+0,         79,         79,        1,   192000, 0x80d0132d
+0,         80,         80,        1,   192000, 0x0789251b
+0,         81,         81,        1,   192000, 0xba1a1f21
+0,         82,         82,        1,   192000, 0x542b42fd
+0,         83,         83,        1,   192000, 0x0ff951ee
+0,         84,         84,        1,   192000, 0x785048f7
+0,         85,         85,        1,   192000, 0x5a50251b
+0,         86,         86,        1,   192000, 0xd5d73a06
+0,         87,         87,        1,   192000, 0x7a3a54eb
+0,         88,         88,        1,   192000, 0x1e2b5de2
+0,         89,         89,        1,   192000, 0xeac542fd
+0,         90,         90,        1,   192000, 0x897a1f21
+0,         91,         91,        1,   192000, 0x61602b15
+0,         92,         92,        1,   192000, 0xb12f221e
+0,         93,         93,        1,   192000, 0x08541f21
+0,         94,         94,        1,   192000, 0xeebd251b
+0,         95,         95,        1,   192000, 0xc1132e12
+0,         96,         96,        1,   192000, 0x99642818
+0,         97,         97,        1,   192000, 0x9b8e162a
+0,         98,         98,        1,   192000, 0x21b81f21
+0,         99,         99,        1,   192000, 0x1abd1030
+0,        100,        100,        1,   192000, 0x0d613d03
+0,        101,        101,        1,   192000, 0xcb32132d
+0,        102,        102,        1,   192000, 0xc680162a
+0,        103,        103,        1,   192000, 0x8dea2818
+0,        104,        104,        1,   192000, 0x3c4e1927
+0,        105,        105,        1,   192000, 0xed733709
+0,        106,        106,        1,   192000, 0xf4051c24
+0,        107,        107,        1,   192000, 0xb8eb221e
+0,        108,        108,        1,   192000, 0x1a412818
+0,        109,        109,        1,   192000, 0x6ee6162a
+0,        110,        110,        1,   192000, 0xe1a248f7
+0,        111,        111,        1,   192000, 0xc2c2221e
+0,        112,        112,        1,   192000, 0x7fdf1f21
+0,        113,        113,        1,   192000, 0x85bc251b
+0,        114,        114,        1,   192000, 0xe77c251b
+0,        115,        115,        1,   192000, 0x8789340c
+0,        116,        116,        1,   192000, 0xb6014000
+0,        117,        117,        1,   192000, 0xaa9542fd
+0,        118,        118,        1,   192000, 0x36ce54eb
+0,        119,        119,        1,   192000, 0xd1324ef1
+0,        120,        120,        1,   192000, 0x0ade60df
+0,        121,        121,        1,   192000, 0xfac56cd3
+0,        122,        122,        1,   192000, 0x00000000
+0,        123,        123,        1,   192000, 0x00000000
+0,        124,        124,        1,   192000, 0xc61c026a
+0,        125,        125,        1,   192000, 0x60810842
+0,        126,        126,        1,   192000, 0x65081393
+0,        127,        127,        1,   192000, 0xc806209f
+0,        128,        128,        1,   192000, 0x53aa32cb
+0,        129,        129,        1,   192000, 0x176546ef
+0,        130,        130,        1,   192000, 0x4e095d0e
+0,        131,        131,        1,   192000, 0xf74b7774
+0,        132,        132,        1,   192000, 0x32809306
+0,        133,        133,        1,   192000, 0x5219ae81
+0,        134,        134,        1,   192000, 0x3badcc40
+0,        135,        135,        1,   192000, 0x1387ea5d
+0,        136,        136,        1,   192000, 0xe0c606f0
+0,        137,        137,        1,   192000, 0x106f2197
+0,        138,        138,        1,   192000, 0xfe2139cf
+0,        139,        139,        1,   192000, 0x907d4f0a
+0,        140,        140,        1,   192000, 0x04415dad
+0,        141,        141,        1,   192000, 0xe0b864b6
+0,        142,        142,        1,   192000, 0xcb2a64b8
+0,        143,        143,        1,   192000, 0xcb2a64b8
+0,        144,        144,        1,   192000, 0xcb2a64b8
+0,        145,        145,        1,   192000, 0xcb2a64b8
+0,        146,        146,        1,   192000, 0xcb2a64b8
+0,        147,        147,        1,   192000, 0xcb2a64b8
+0,        148,        148,        1,   192000, 0xcb2a64b8
+0,        149,        149,        1,   192000, 0xcb2a64b8
+0,        150,        150,        1,   192000, 0xcb2a64b8
+0,        151,        151,        1,   192000, 0xcb2a64b8
+0,        152,        152,        1,   192000, 0xcb2a64b8
+0,        153,        153,        1,   192000, 0xcb2a64b8
+0,        154,        154,        1,   192000, 0xcb2a64b8
+0,        155,        155,        1,   192000, 0xcb2a64b8
+0,        156,        156,        1,   192000, 0xcb2a64b8
+0,        157,        157,        1,   192000, 0xcb2a64b8
+0,        158,        158,        1,   192000, 0xcb2a64b8