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, 84 insertions, 83 deletions

diff --git a/tests/ref/fate/qtrle-16bit b/tests/ref/fate/qtrle-16bit
index 6ed472a977..2021f2a6e8 100644
--- a/tests/ref/fate/qtrle-16bit
+++ b/tests/ref/fate/qtrle-16bit
@@ -1,83 +1,84 @@
-0, 0, 57600, 0xcf2d39fc
-0, 6000, 57600, 0xfc9f6bed
-0, 12000, 57600, 0x3f5805bb
-0, 18000, 57600, 0xcb34504e
-0, 24000, 57600, 0x66b6f6e9
-0, 30000, 57600, 0x18698e4d
-0, 36000, 57600, 0x233288d7
-0, 42000, 57600, 0x6b195ac5
-0, 48000, 57600, 0x3b466b45
-0, 54000, 57600, 0x9e3dbd75
-0, 60000, 57600, 0x90ee04b7
-0, 66000, 57600, 0x81096dda
-0, 72000, 57600, 0xef24ca50
-0, 78000, 57600, 0xea7a3da8
-0, 84000, 57600, 0xc3f054c2
-0, 90000, 57600, 0x34af39ec
-0, 96000, 57600, 0xfc31f846
-0, 102000, 57600, 0xa4606399
-0, 108000, 57600, 0x4b8a9c88
-0, 114000, 57600, 0x87db3195
-0, 120000, 57600, 0x443b618d
-0, 126000, 57600, 0x601e380e
-0, 132000, 57600, 0x405c6e6f
-0, 138000, 57600, 0xe6b66f29
-0, 144000, 57600, 0xb8e4b2d1
-0, 150000, 57600, 0x9fc8e7da
-0, 156000, 57600, 0x3bdb363b
-0, 162000, 57600, 0xacac0b6a
-0, 168000, 57600, 0xff3022fb
-0, 174000, 57600, 0x1e5721f3
-0, 180000, 57600, 0x511a3071
-0, 186000, 57600, 0xff6d4dc0
-0, 192000, 57600, 0x5df97a35
-0, 198000, 57600, 0x3877f1b1
-0, 204000, 57600, 0xa9096dd2
-0, 210000, 57600, 0xd36e1ccc
-0, 216000, 57600, 0xdc94b124
-0, 222000, 57600, 0x873fab49
-0, 228000, 57600, 0x7f081dca
-0, 234000, 57600, 0x7df52bc3
-0, 240000, 57600, 0xf41feb99
-0, 246000, 57600, 0xcf59ffeb
-0, 252000, 57600, 0x0dd94dfe
-0, 258000, 57600, 0xfbc52500
-0, 264000, 57600, 0xc300606e
-0, 270000, 57600, 0x01e529b4
-0, 276000, 57600, 0x359a57b0
-0, 282000, 57600, 0xcfee7511
-0, 288000, 57600, 0x2189f139
-0, 294000, 57600, 0xcc535558
-0, 300000, 57600, 0xeed13a76
-0, 306000, 57600, 0xfb5c3ddd
-0, 312000, 57600, 0x36a98c53
-0, 318000, 57600, 0xf4c38c4b
-0, 324000, 57600, 0x53d5df15
-0, 330000, 57600, 0x336d890c
-0, 336000, 57600, 0x19967f1c
-0, 342000, 57600, 0xa36b8224
-0, 348000, 57600, 0xf6ec2490
-0, 354000, 57600, 0x6ffff0d1
-0, 360000, 57600, 0xfcb73114
-0, 366000, 57600, 0x5f5fff35
-0, 372000, 57600, 0xf113c4a0
-0, 378000, 57600, 0x64ca6175
-0, 384000, 57600, 0x3f6f7d15
-0, 390000, 57600, 0x18b619df
-0, 396000, 57600, 0xe6872ed7
-0, 402000, 57600, 0x3641e174
-0, 408000, 57600, 0x4c144d8c
-0, 414000, 57600, 0x82529776
-0, 420000, 57600, 0xd96f3ead
-0, 426000, 57600, 0xce183c4e
-0, 432000, 57600, 0xaa475b24
-0, 438000, 57600, 0xf7c5cbf3
-0, 444000, 57600, 0x798e0548
-0, 450000, 57600, 0x1233241a
-0, 456000, 57600, 0x1424d758
-0, 462000, 57600, 0xa446c264
-0, 468000, 57600, 0x66e082ae
-0, 474000, 57600, 0xb58cacc8
-0, 480000, 57600, 0x3d86431c
-0, 486000, 57600, 0x601b724e
-0, 492000, 57600, 0xbe9a32c8
+#tb 0: 1/15
+0,          0,          0,        1,    57600, 0xcf2d39fc
+0,          1,          1,        1,    57600, 0xfc9f6bed
+0,          2,          2,        1,    57600, 0x3f5805bb
+0,          3,          3,        1,    57600, 0xcb34504e
+0,          4,          4,        1,    57600, 0x66b6f6e9
+0,          5,          5,        1,    57600, 0x18698e4d
+0,          6,          6,        1,    57600, 0x233288d7
+0,          7,          7,        1,    57600, 0x6b195ac5
+0,          8,          8,        1,    57600, 0x3b466b45
+0,          9,          9,        1,    57600, 0x9e3dbd75
+0,         10,         10,        1,    57600, 0x90ee04b7
+0,         11,         11,        1,    57600, 0x81096dda
+0,         12,         12,        1,    57600, 0xef24ca50
+0,         13,         13,        1,    57600, 0xea7a3da8
+0,         14,         14,        1,    57600, 0xc3f054c2
+0,         15,         15,        1,    57600, 0x34af39ec
+0,         16,         16,        1,    57600, 0xfc31f846
+0,         17,         17,        1,    57600, 0xa4606399
+0,         18,         18,        1,    57600, 0x4b8a9c88
+0,         19,         19,        1,    57600, 0x87db3195
+0,         20,         20,        1,    57600, 0x443b618d
+0,         21,         21,        1,    57600, 0x601e380e
+0,         22,         22,        1,    57600, 0x405c6e6f
+0,         23,         23,        1,    57600, 0xe6b66f29
+0,         24,         24,        1,    57600, 0xb8e4b2d1
+0,         25,         25,        1,    57600, 0x9fc8e7da
+0,         26,         26,        1,    57600, 0x3bdb363b
+0,         27,         27,        1,    57600, 0xacac0b6a
+0,         28,         28,        1,    57600, 0xff3022fb
+0,         29,         29,        1,    57600, 0x1e5721f3
+0,         30,         30,        1,    57600, 0x511a3071
+0,         31,         31,        1,    57600, 0xff6d4dc0
+0,         32,         32,        1,    57600, 0x5df97a35
+0,         33,         33,        1,    57600, 0x3877f1b1
+0,         34,         34,        1,    57600, 0xa9096dd2
+0,         35,         35,        1,    57600, 0xd36e1ccc
+0,         36,         36,        1,    57600, 0xdc94b124
+0,         37,         37,        1,    57600, 0x873fab49
+0,         38,         38,        1,    57600, 0x7f081dca
+0,         39,         39,        1,    57600, 0x7df52bc3
+0,         40,         40,        1,    57600, 0xf41feb99
+0,         41,         41,        1,    57600, 0xcf59ffeb
+0,         42,         42,        1,    57600, 0x0dd94dfe
+0,         43,         43,        1,    57600, 0xfbc52500
+0,         44,         44,        1,    57600, 0xc300606e
+0,         45,         45,        1,    57600, 0x01e529b4
+0,         46,         46,        1,    57600, 0x359a57b0
+0,         47,         47,        1,    57600, 0xcfee7511
+0,         48,         48,        1,    57600, 0x2189f139
+0,         49,         49,        1,    57600, 0xcc535558
+0,         50,         50,        1,    57600, 0xeed13a76
+0,         51,         51,        1,    57600, 0xfb5c3ddd
+0,         52,         52,        1,    57600, 0x36a98c53
+0,         53,         53,        1,    57600, 0xf4c38c4b
+0,         54,         54,        1,    57600, 0x53d5df15
+0,         55,         55,        1,    57600, 0x336d890c
+0,         56,         56,        1,    57600, 0x19967f1c
+0,         57,         57,        1,    57600, 0xa36b8224
+0,         58,         58,        1,    57600, 0xf6ec2490
+0,         59,         59,        1,    57600, 0x6ffff0d1
+0,         60,         60,        1,    57600, 0xfcb73114
+0,         61,         61,        1,    57600, 0x5f5fff35
+0,         62,         62,        1,    57600, 0xf113c4a0
+0,         63,         63,        1,    57600, 0x64ca6175
+0,         64,         64,        1,    57600, 0x3f6f7d15
+0,         65,         65,        1,    57600, 0x18b619df
+0,         66,         66,        1,    57600, 0xe6872ed7
+0,         67,         67,        1,    57600, 0x3641e174
+0,         68,         68,        1,    57600, 0x4c144d8c
+0,         69,         69,        1,    57600, 0x82529776
+0,         70,         70,        1,    57600, 0xd96f3ead
+0,         71,         71,        1,    57600, 0xce183c4e
+0,         72,         72,        1,    57600, 0xaa475b24
+0,         73,         73,        1,    57600, 0xf7c5cbf3
+0,         74,         74,        1,    57600, 0x798e0548
+0,         75,         75,        1,    57600, 0x1233241a
+0,         76,         76,        1,    57600, 0x1424d758
+0,         77,         77,        1,    57600, 0xa446c264
+0,         78,         78,        1,    57600, 0x66e082ae
+0,         79,         79,        1,    57600, 0xb58cacc8
+0,         80,         80,        1,    57600, 0x3d86431c
+0,         81,         81,        1,    57600, 0x601b724e
+0,         82,         82,        1,    57600, 0xbe9a32c8