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, 117 insertions, 116 deletions

diff --git a/tests/ref/fate/flic-af11-palette-change b/tests/ref/fate/flic-af11-palette-change
index 8503cbaccd..cd702b622c 100644
--- a/tests/ref/fate/flic-af11-palette-change
+++ b/tests/ref/fate/flic-af11-palette-change
@@ -1,116 +1,117 @@
-0, 0, 192000, 0x508ff8ac
-0, 2571, 192000, 0xef0d4274
-0, 5143, 192000, 0x0d50e0dd
-0, 7714, 192000, 0xf638f782
-0, 10286, 192000, 0x40e4314b
-0, 12857, 192000, 0x0ce5318f
-0, 15429, 192000, 0x14848fa9
-0, 18000, 192000, 0x676f83e1
-0, 20571, 192000, 0x5b98bea9
-0, 23143, 192000, 0xf5cc709d
-0, 25714, 192000, 0x719a0373
-0, 28286, 192000, 0xba5a3e74
-0, 30857, 192000, 0x34e10051
-0, 33429, 192000, 0xb66dd42d
-0, 36000, 192000, 0xfb58c833
-0, 38571, 192000, 0xa28029a4
-0, 41143, 192000, 0x28fa09b3
-0, 43714, 192000, 0x676f0b08
-0, 46286, 192000, 0x7af97965
-0, 48857, 192000, 0x436f0f03
-0, 51429, 192000, 0xbaca5814
-0, 54000, 192000, 0xca97eb51
-0, 56571, 192000, 0x1fc89137
-0, 59143, 192000, 0x8af63a74
-0, 61714, 192000, 0xca015077
-0, 64286, 192000, 0x761599ad
-0, 66857, 192000, 0x1ca1570c
-0, 69429, 192000, 0x1209a3ac
-0, 72000, 192000, 0xf7d92d01
-0, 74571, 192000, 0x970d6fea
-0, 77143, 192000, 0x508ff8ac
-0, 79714, 192000, 0xef0d4274
-0, 82286, 192000, 0x0d50e0dd
-0, 84857, 192000, 0xf638f782
-0, 87429, 192000, 0x40e4314b
-0, 90000, 192000, 0x0ce5318f
-0, 92571, 192000, 0x14848fa9
-0, 95143, 192000, 0x676f83e1
-0, 97714, 192000, 0x5b98bea9
-0, 100286, 192000, 0xf5cc709d
-0, 102857, 192000, 0x719a0373
-0, 105429, 192000, 0xba5a3e74
-0, 108000, 192000, 0x34e10051
-0, 110571, 192000, 0xb66dd42d
-0, 113143, 192000, 0xfb58c833
-0, 115714, 192000, 0xa28029a4
-0, 118286, 192000, 0x28fa09b3
-0, 120857, 192000, 0x676f0b08
-0, 123429, 192000, 0x7af97965
-0, 126000, 192000, 0x436f0f03
-0, 128571, 192000, 0xbaca5814
-0, 131143, 192000, 0xca97eb51
-0, 133714, 192000, 0x1fc89137
-0, 136286, 192000, 0x8af63a74
-0, 138857, 192000, 0xca015077
-0, 141429, 192000, 0x761599ad
-0, 144000, 192000, 0x1ca1570c
-0, 146571, 192000, 0x1209a3ac
-0, 149143, 192000, 0xf7d92d01
-0, 151714, 192000, 0x970d6fea
-0, 154286, 192000, 0x508ff8ac
-0, 156857, 192000, 0xef0d4274
-0, 159429, 192000, 0x0d50e0dd
-0, 162000, 192000, 0xf638f782
-0, 164571, 192000, 0x40e4314b
-0, 167143, 192000, 0x0ce5318f
-0, 169714, 192000, 0x14848fa9
-0, 172286, 192000, 0x676f83e1
-0, 174857, 192000, 0x5b98bea9
-0, 177429, 192000, 0xf5cc709d
-0, 180000, 192000, 0x719a0373
-0, 182571, 192000, 0xba5a3e74
-0, 185143, 192000, 0x34e10051
-0, 187714, 192000, 0xb66dd42d
-0, 190286, 192000, 0xfb58c833
-0, 192857, 192000, 0xa28029a4
-0, 195429, 192000, 0x28fa09b3
-0, 198000, 192000, 0x676f0b08
-0, 200571, 192000, 0x7af97965
-0, 203143, 192000, 0x436f0f03
-0, 205714, 192000, 0xbaca5814
-0, 208286, 192000, 0xca97eb51
-0, 210857, 192000, 0x1fc89137
-0, 213429, 192000, 0x8af63a74
-0, 216000, 192000, 0xca015077
-0, 218571, 192000, 0x761599ad
-0, 221143, 192000, 0x1ca1570c
-0, 223714, 192000, 0x1209a3ac
-0, 226286, 192000, 0xf7d92d01
-0, 228857, 192000, 0x970d6fea
-0, 231429, 192000, 0x1ff28298
-0, 234000, 192000, 0x1ff28298
-0, 236571, 192000, 0x407d09ca
-0, 239143, 192000, 0x407d09ca
-0, 241714, 192000, 0xc743a475
-0, 244286, 192000, 0xc743a475
-0, 246857, 192000, 0x46bf9f7d
-0, 249429, 192000, 0x46bf9f7d
-0, 252000, 192000, 0x57ecb2c1
-0, 254571, 192000, 0x57ecb2c1
-0, 257143, 192000, 0x680fd3bf
-0, 259714, 192000, 0x680fd3bf
-0, 262286, 192000, 0x8772ca19
-0, 264857, 192000, 0x8772ca19
-0, 267429, 192000, 0x3cc29bbf
-0, 270000, 192000, 0x3cc29bbf
-0, 272571, 192000, 0xe745fb3c
-0, 275143, 192000, 0xe745fb3c
-0, 277714, 192000, 0xc5279397
-0, 280286, 192000, 0xcc902b35
-0, 282857, 192000, 0x50a7cf32
-0, 285429, 192000, 0x23fd6f51
-0, 288000, 192000, 0x14fe9c4d
-0, 290571, 192000, 0x703249f9
-0, 293143, 192000, 0x47b73bce
-0, 295714, 192000, 0x13bce1c9
+#tb 0: 1/35
+0,          0,          0,        1,   192000, 0x508ff8ac
+0,          1,          1,        1,   192000, 0xef0d4274
+0,          2,          2,        1,   192000, 0x0d50e0dd
+0,          3,          3,        1,   192000, 0xf638f782
+0,          4,          4,        1,   192000, 0x40e4314b
+0,          5,          5,        1,   192000, 0x0ce5318f
+0,          6,          6,        1,   192000, 0x14848fa9
+0,          7,          7,        1,   192000, 0x676f83e1
+0,          8,          8,        1,   192000, 0x5b98bea9
+0,          9,          9,        1,   192000, 0xf5cc709d
+0,         10,         10,        1,   192000, 0x719a0373
+0,         11,         11,        1,   192000, 0xba5a3e74
+0,         12,         12,        1,   192000, 0x34e10051
+0,         13,         13,        1,   192000, 0xb66dd42d
+0,         14,         14,        1,   192000, 0xfb58c833
+0,         15,         15,        1,   192000, 0xa28029a4
+0,         16,         16,        1,   192000, 0x28fa09b3
+0,         17,         17,        1,   192000, 0x676f0b08
+0,         18,         18,        1,   192000, 0x7af97965
+0,         19,         19,        1,   192000, 0x436f0f03
+0,         20,         20,        1,   192000, 0xbaca5814
+0,         21,         21,        1,   192000, 0xca97eb51
+0,         22,         22,        1,   192000, 0x1fc89137
+0,         23,         23,        1,   192000, 0x8af63a74
+0,         24,         24,        1,   192000, 0xca015077
+0,         25,         25,        1,   192000, 0x761599ad
+0,         26,         26,        1,   192000, 0x1ca1570c
+0,         27,         27,        1,   192000, 0x1209a3ac
+0,         28,         28,        1,   192000, 0xf7d92d01
+0,         29,         29,        1,   192000, 0x970d6fea
+0,         30,         30,        1,   192000, 0x508ff8ac
+0,         31,         31,        1,   192000, 0xef0d4274
+0,         32,         32,        1,   192000, 0x0d50e0dd
+0,         33,         33,        1,   192000, 0xf638f782
+0,         34,         34,        1,   192000, 0x40e4314b
+0,         35,         35,        1,   192000, 0x0ce5318f
+0,         36,         36,        1,   192000, 0x14848fa9
+0,         37,         37,        1,   192000, 0x676f83e1
+0,         38,         38,        1,   192000, 0x5b98bea9
+0,         39,         39,        1,   192000, 0xf5cc709d
+0,         40,         40,        1,   192000, 0x719a0373
+0,         41,         41,        1,   192000, 0xba5a3e74
+0,         42,         42,        1,   192000, 0x34e10051
+0,         43,         43,        1,   192000, 0xb66dd42d
+0,         44,         44,        1,   192000, 0xfb58c833
+0,         45,         45,        1,   192000, 0xa28029a4
+0,         46,         46,        1,   192000, 0x28fa09b3
+0,         47,         47,        1,   192000, 0x676f0b08
+0,         48,         48,        1,   192000, 0x7af97965
+0,         49,         49,        1,   192000, 0x436f0f03
+0,         50,         50,        1,   192000, 0xbaca5814
+0,         51,         51,        1,   192000, 0xca97eb51
+0,         52,         52,        1,   192000, 0x1fc89137
+0,         53,         53,        1,   192000, 0x8af63a74
+0,         54,         54,        1,   192000, 0xca015077
+0,         55,         55,        1,   192000, 0x761599ad
+0,         56,         56,        1,   192000, 0x1ca1570c
+0,         57,         57,        1,   192000, 0x1209a3ac
+0,         58,         58,        1,   192000, 0xf7d92d01
+0,         59,         59,        1,   192000, 0x970d6fea
+0,         60,         60,        1,   192000, 0x508ff8ac
+0,         61,         61,        1,   192000, 0xef0d4274
+0,         62,         62,        1,   192000, 0x0d50e0dd
+0,         63,         63,        1,   192000, 0xf638f782
+0,         64,         64,        1,   192000, 0x40e4314b
+0,         65,         65,        1,   192000, 0x0ce5318f
+0,         66,         66,        1,   192000, 0x14848fa9
+0,         67,         67,        1,   192000, 0x676f83e1
+0,         68,         68,        1,   192000, 0x5b98bea9
+0,         69,         69,        1,   192000, 0xf5cc709d
+0,         70,         70,        1,   192000, 0x719a0373
+0,         71,         71,        1,   192000, 0xba5a3e74
+0,         72,         72,        1,   192000, 0x34e10051
+0,         73,         73,        1,   192000, 0xb66dd42d
+0,         74,         74,        1,   192000, 0xfb58c833
+0,         75,         75,        1,   192000, 0xa28029a4
+0,         76,         76,        1,   192000, 0x28fa09b3
+0,         77,         77,        1,   192000, 0x676f0b08
+0,         78,         78,        1,   192000, 0x7af97965
+0,         79,         79,        1,   192000, 0x436f0f03
+0,         80,         80,        1,   192000, 0xbaca5814
+0,         81,         81,        1,   192000, 0xca97eb51
+0,         82,         82,        1,   192000, 0x1fc89137
+0,         83,         83,        1,   192000, 0x8af63a74
+0,         84,         84,        1,   192000, 0xca015077
+0,         85,         85,        1,   192000, 0x761599ad
+0,         86,         86,        1,   192000, 0x1ca1570c
+0,         87,         87,        1,   192000, 0x1209a3ac
+0,         88,         88,        1,   192000, 0xf7d92d01
+0,         89,         89,        1,   192000, 0x970d6fea
+0,         90,         90,        1,   192000, 0x1ff28298
+0,         91,         91,        1,   192000, 0x1ff28298
+0,         92,         92,        1,   192000, 0x407d09ca
+0,         93,         93,        1,   192000, 0x407d09ca
+0,         94,         94,        1,   192000, 0xc743a475
+0,         95,         95,        1,   192000, 0xc743a475
+0,         96,         96,        1,   192000, 0x46bf9f7d
+0,         97,         97,        1,   192000, 0x46bf9f7d
+0,         98,         98,        1,   192000, 0x57ecb2c1
+0,         99,         99,        1,   192000, 0x57ecb2c1
+0,        100,        100,        1,   192000, 0x680fd3bf
+0,        101,        101,        1,   192000, 0x680fd3bf
+0,        102,        102,        1,   192000, 0x8772ca19
+0,        103,        103,        1,   192000, 0x8772ca19
+0,        104,        104,        1,   192000, 0x3cc29bbf
+0,        105,        105,        1,   192000, 0x3cc29bbf
+0,        106,        106,        1,   192000, 0xe745fb3c
+0,        107,        107,        1,   192000, 0xe745fb3c
+0,        108,        108,        1,   192000, 0xc5279397
+0,        109,        109,        1,   192000, 0xcc902b35
+0,        110,        110,        1,   192000, 0x50a7cf32
+0,        111,        111,        1,   192000, 0x23fd6f51
+0,        112,        112,        1,   192000, 0x14fe9c4d
+0,        113,        113,        1,   192000, 0x703249f9
+0,        114,        114,        1,   192000, 0x47b73bce
+0,        115,        115,        1,   192000, 0x13bce1c9