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

diff --git a/tests/ref/fate/vmnc-32bit b/tests/ref/fate/vmnc-32bit
index 62211026ba..d55d88f66b 100644
--- a/tests/ref/fate/vmnc-32bit
+++ b/tests/ref/fate/vmnc-32bit
@@ -1,49 +1,50 @@
-0, 0, 3655644, 0x87973530
-0, 18000, 3655644, 0x87973530
-0, 36000, 3655644, 0x3c3167fd
-0, 90000, 3655644, 0x87973530
-0, 126000, 3655644, 0x3c3167fd
-0, 180000, 3655644, 0x87973530
-0, 198000, 3655644, 0x87973530
-0, 216000, 3655644, 0x3c3167fd
-0, 270000, 3655644, 0x87973530
-0, 324000, 3655644, 0x4f0da763
-0, 342000, 3655644, 0x66a4a763
-0, 360000, 3655644, 0xb20a7496
-0, 414000, 3655644, 0x66a4a763
-0, 432000, 3655644, 0x5600644a
-0, 468000, 3655644, 0xce5880ee
-0, 882000, 3655644, 0xa993ef3d
-0, 1098000, 3655644, 0x73564014
-0, 1152000, 3655644, 0x2a6e1e8c
-0, 1224000, 3655644, 0xbae02e7c
-0, 1296000, 3655644, 0x55af4a2d
-0, 1314000, 3655644, 0x54b7ff2d
-0, 1386000, 3655644, 0x39af1aed
-0, 1476000, 3655644, 0xe48dd11c
-0, 1602000, 3655644, 0xba15c78d
-0, 1728000, 3655644, 0x39af1aed
-0, 1854000, 3655644, 0x27f96cd8
-0, 1980000, 3655644, 0xf4f068dc
-0, 1998000, 3655644, 0xf1c55cf5
-0, 2034000, 3655644, 0xd932633d
-0, 2052000, 3655644, 0xc6e95e0a
-0, 2070000, 3655644, 0x9a63c9de
-0, 2088000, 3655644, 0xf166ad4f
-0, 2106000, 3655644, 0xe9eeba41
-0, 2124000, 3655644, 0x7e598ad7
-0, 2214000, 3655644, 0xf3bd257e
-0, 2286000, 3655644, 0xf35b3852
-0, 2304000, 3655644, 0x9d553959
-0, 2322000, 3655644, 0x0a9de8e2
-0, 2430000, 3655644, 0xf2325b6c
-0, 2466000, 3655644, 0xcf924028
-0, 2502000, 3655644, 0x8dae55bc
-0, 2538000, 3655644, 0x57b08ced
-0, 2574000, 3655644, 0xef89a1d8
-0, 2610000, 3655644, 0x69e5503a
-0, 2646000, 3655644, 0xc3de7b3f
-0, 2682000, 3655644, 0x88eea64a
-0, 2916000, 3655644, 0xe39cce1f
-0, 2988000, 3655644, 0xf0ed0d04
-0, 3078000, 3655644, 0x32490d3e
+#tb 0: 1/5
+0,          0,          0,        1,  3655644, 0x87973530
+0,          1,          1,        1,  3655644, 0x87973530
+0,          2,          2,        1,  3655644, 0x3c3167fd
+0,          5,          5,        1,  3655644, 0x87973530
+0,          7,          7,        1,  3655644, 0x3c3167fd
+0,         10,         10,        1,  3655644, 0x87973530
+0,         11,         11,        1,  3655644, 0x87973530
+0,         12,         12,        1,  3655644, 0x3c3167fd
+0,         15,         15,        1,  3655644, 0x87973530
+0,         18,         18,        1,  3655644, 0x4f0da763
+0,         19,         19,        1,  3655644, 0x66a4a763
+0,         20,         20,        1,  3655644, 0xb20a7496
+0,         23,         23,        1,  3655644, 0x66a4a763
+0,         24,         24,        1,  3655644, 0x5600644a
+0,         26,         26,        1,  3655644, 0xce5880ee
+0,         49,         49,        1,  3655644, 0xa993ef3d
+0,         61,         61,        1,  3655644, 0x73564014
+0,         64,         64,        1,  3655644, 0x2a6e1e8c
+0,         68,         68,        1,  3655644, 0xbae02e7c
+0,         72,         72,        1,  3655644, 0x55af4a2d
+0,         73,         73,        1,  3655644, 0x54b7ff2d
+0,         77,         77,        1,  3655644, 0x39af1aed
+0,         82,         82,        1,  3655644, 0xe48dd11c
+0,         89,         89,        1,  3655644, 0xba15c78d
+0,         96,         96,        1,  3655644, 0x39af1aed
+0,        103,        103,        1,  3655644, 0x27f96cd8
+0,        110,        110,        1,  3655644, 0xf4f068dc
+0,        111,        111,        1,  3655644, 0xf1c55cf5
+0,        113,        113,        1,  3655644, 0xd932633d
+0,        114,        114,        1,  3655644, 0xc6e95e0a
+0,        115,        115,        1,  3655644, 0x9a63c9de
+0,        116,        116,        1,  3655644, 0xf166ad4f
+0,        117,        117,        1,  3655644, 0xe9eeba41
+0,        118,        118,        1,  3655644, 0x7e598ad7
+0,        123,        123,        1,  3655644, 0xf3bd257e
+0,        127,        127,        1,  3655644, 0xf35b3852
+0,        128,        128,        1,  3655644, 0x9d553959
+0,        129,        129,        1,  3655644, 0x0a9de8e2
+0,        135,        135,        1,  3655644, 0xf2325b6c
+0,        137,        137,        1,  3655644, 0xcf924028
+0,        139,        139,        1,  3655644, 0x8dae55bc
+0,        141,        141,        1,  3655644, 0x57b08ced
+0,        143,        143,        1,  3655644, 0xef89a1d8
+0,        145,        145,        1,  3655644, 0x69e5503a
+0,        147,        147,        1,  3655644, 0xc3de7b3f
+0,        149,        149,        1,  3655644, 0x88eea64a
+0,        162,        162,        1,  3655644, 0xe39cce1f
+0,        166,        166,        1,  3655644, 0xf0ed0d04
+0,        171,        171,        1,  3655644, 0x32490d3e