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, 51 insertions, 50 deletions

diff --git a/tests/ref/fate/msmpeg4v1 b/tests/ref/fate/msmpeg4v1
index d6fea22dd3..d67a0efa17 100644
--- a/tests/ref/fate/msmpeg4v1
+++ b/tests/ref/fate/msmpeg4v1
@@ -1,50 +1,51 @@
-0, 0, 126720, 0x84284323
-0, 3003, 126720, 0x336fe236
-0, 6006, 126720, 0x901f1299
-0, 9009, 126720, 0x3b8be5fe
-0, 12012, 126720, 0x6da06397
-0, 15015, 126720, 0xe83de744
-0, 18018, 126720, 0xef2ed2bb
-0, 21021, 126720, 0x3ed1797f
-0, 24024, 126720, 0xf8c81785
-0, 27027, 126720, 0xf38239e0
-0, 30030, 126720, 0x005a2d6d
-0, 33033, 126720, 0xd6be525d
-0, 36036, 126720, 0x39482727
-0, 39039, 126720, 0xc8d95bc5
-0, 42042, 126720, 0xbaebd1e7
-0, 45045, 126720, 0xc94d60b3
-0, 48048, 126720, 0x80886d64
-0, 51051, 126720, 0xf99a39ee
-0, 54054, 126720, 0xbc8b6c26
-0, 57057, 126720, 0x2270acf1
-0, 60060, 126720, 0x754b5965
-0, 63063, 126720, 0x5312dc30
-0, 66066, 126720, 0x2254cc6e
-0, 69069, 126720, 0x58b4bdcc
-0, 72072, 126720, 0xd1ed63ee
-0, 75075, 126720, 0x4442dec5
-0, 78078, 126720, 0x53403cef
-0, 81081, 126720, 0x495d575f
-0, 84084, 126720, 0x3ebfc7e8
-0, 87087, 126720, 0x8f0abe01
-0, 90090, 126720, 0x9540ba61
-0, 93093, 126720, 0xb011e3cf
-0, 96096, 126720, 0x70b4b1f4
-0, 99099, 126720, 0x803b67f9
-0, 102102, 126720, 0xa1c92662
-0, 105105, 126720, 0x3a3d9e4c
-0, 108108, 126720, 0x12660aa2
-0, 111111, 126720, 0xb84c7602
-0, 114114, 126720, 0x920df241
-0, 117117, 126720, 0x5f9db168
-0, 120120, 126720, 0xe3f524a6
-0, 123123, 126720, 0x5f390fa7
-0, 126126, 126720, 0xa9503b4f
-0, 129129, 126720, 0x259c08e2
-0, 132132, 126720, 0xef7a0279
-0, 135135, 126720, 0x4d31ed35
-0, 138138, 126720, 0xe10e3c7e
-0, 141141, 126720, 0xc35f191e
-0, 144144, 126720, 0x3401e9a9
-0, 147147, 126720, 0xd50603f9
+#tb 0: 100/2997
+0,          0,          0,        1,   126720, 0x84284323
+0,          1,          1,        1,   126720, 0x336fe236
+0,          2,          2,        1,   126720, 0x901f1299
+0,          3,          3,        1,   126720, 0x3b8be5fe
+0,          4,          4,        1,   126720, 0x6da06397
+0,          5,          5,        1,   126720, 0xe83de744
+0,          6,          6,        1,   126720, 0xef2ed2bb
+0,          7,          7,        1,   126720, 0x3ed1797f
+0,          8,          8,        1,   126720, 0xf8c81785
+0,          9,          9,        1,   126720, 0xf38239e0
+0,         10,         10,        1,   126720, 0x005a2d6d
+0,         11,         11,        1,   126720, 0xd6be525d
+0,         12,         12,        1,   126720, 0x39482727
+0,         13,         13,        1,   126720, 0xc8d95bc5
+0,         14,         14,        1,   126720, 0xbaebd1e7
+0,         15,         15,        1,   126720, 0xc94d60b3
+0,         16,         16,        1,   126720, 0x80886d64
+0,         17,         17,        1,   126720, 0xf99a39ee
+0,         18,         18,        1,   126720, 0xbc8b6c26
+0,         19,         19,        1,   126720, 0x2270acf1
+0,         20,         20,        1,   126720, 0x754b5965
+0,         21,         21,        1,   126720, 0x5312dc30
+0,         22,         22,        1,   126720, 0x2254cc6e
+0,         23,         23,        1,   126720, 0x58b4bdcc
+0,         24,         24,        1,   126720, 0xd1ed63ee
+0,         25,         25,        1,   126720, 0x4442dec5
+0,         26,         26,        1,   126720, 0x53403cef
+0,         27,         27,        1,   126720, 0x495d575f
+0,         28,         28,        1,   126720, 0x3ebfc7e8
+0,         29,         29,        1,   126720, 0x8f0abe01
+0,         30,         30,        1,   126720, 0x9540ba61
+0,         31,         31,        1,   126720, 0xb011e3cf
+0,         32,         32,        1,   126720, 0x70b4b1f4
+0,         33,         33,        1,   126720, 0x803b67f9
+0,         34,         34,        1,   126720, 0xa1c92662
+0,         35,         35,        1,   126720, 0x3a3d9e4c
+0,         36,         36,        1,   126720, 0x12660aa2
+0,         37,         37,        1,   126720, 0xb84c7602
+0,         38,         38,        1,   126720, 0x920df241
+0,         39,         39,        1,   126720, 0x5f9db168
+0,         40,         40,        1,   126720, 0xe3f524a6
+0,         41,         41,        1,   126720, 0x5f390fa7
+0,         42,         42,        1,   126720, 0xa9503b4f
+0,         43,         43,        1,   126720, 0x259c08e2
+0,         44,         44,        1,   126720, 0xef7a0279
+0,         45,         45,        1,   126720, 0x4d31ed35
+0,         46,         46,        1,   126720, 0xe10e3c7e
+0,         47,         47,        1,   126720, 0xc35f191e
+0,         48,         48,        1,   126720, 0x3401e9a9
+0,         49,         49,        1,   126720, 0xd50603f9