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, 32 insertions, 31 deletions

diff --git a/tests/ref/fate/msvideo1-8bit b/tests/ref/fate/msvideo1-8bit
index e0c70338e4..6e6bc0bae0 100644
--- a/tests/ref/fate/msvideo1-8bit
+++ b/tests/ref/fate/msvideo1-8bit
@@ -1,31 +1,32 @@
-0, 0, 57600, 0x8c3c5ee8
-0, 3000, 57600, 0xb79800b1
-0, 6000, 57600, 0x54a221be
-0, 9000, 57600, 0xb377ffb3
-0, 12000, 57600, 0x46efd210
-0, 15000, 57600, 0x46efd210
-0, 18000, 57600, 0x46efd210
-0, 21000, 57600, 0x92751fbc
-0, 24000, 57600, 0xd7287442
-0, 27000, 57600, 0xcf1153ee
-0, 30000, 57600, 0xda5de91a
-0, 33000, 57600, 0xa11cd513
-0, 36000, 57600, 0xa8edac2a
-0, 39000, 57600, 0xefd2a392
-0, 42000, 57600, 0x2d7060cf
-0, 45000, 57600, 0xbda3130d
-0, 48000, 57600, 0xacb8e940
-0, 50999, 57600, 0x93778985
-0, 53999, 57600, 0x25ed4d97
-0, 56999, 57600, 0x5be924bf
-0, 59999, 57600, 0xde5ee1f7
-0, 62999, 57600, 0x39850ab6
-0, 65999, 57600, 0x77da195d
-0, 68999, 57600, 0x6dad13c0
-0, 71999, 57600, 0x69897c48
-0, 74999, 57600, 0xfbe74728
-0, 77999, 57600, 0x908af79d
-0, 80999, 57600, 0x4ec4a868
-0, 83999, 57600, 0x7db370a1
-0, 86999, 57600, 0x2b1e52f6
-0, 89999, 57600, 0x2141467c
+#tb 0: 10000/300003
+0,          0,          0,        1,    57600, 0x8c3c5ee8
+0,          1,          1,        1,    57600, 0xb79800b1
+0,          2,          2,        1,    57600, 0x54a221be
+0,          3,          3,        1,    57600, 0xb377ffb3
+0,          4,          4,        1,    57600, 0x46efd210
+0,          5,          5,        1,    57600, 0x46efd210
+0,          6,          6,        1,    57600, 0x46efd210
+0,          7,          7,        1,    57600, 0x92751fbc
+0,          8,          8,        1,    57600, 0xd7287442
+0,          9,          9,        1,    57600, 0xcf1153ee
+0,         10,         10,        1,    57600, 0xda5de91a
+0,         11,         11,        1,    57600, 0xa11cd513
+0,         12,         12,        1,    57600, 0xa8edac2a
+0,         13,         13,        1,    57600, 0xefd2a392
+0,         14,         14,        1,    57600, 0x2d7060cf
+0,         15,         15,        1,    57600, 0xbda3130d
+0,         16,         16,        1,    57600, 0xacb8e940
+0,         17,         17,        1,    57600, 0x93778985
+0,         18,         18,        1,    57600, 0x25ed4d97
+0,         19,         19,        1,    57600, 0x5be924bf
+0,         20,         20,        1,    57600, 0xde5ee1f7
+0,         21,         21,        1,    57600, 0x39850ab6
+0,         22,         22,        1,    57600, 0x77da195d
+0,         23,         23,        1,    57600, 0x6dad13c0
+0,         24,         24,        1,    57600, 0x69897c48
+0,         25,         25,        1,    57600, 0xfbe74728
+0,         26,         26,        1,    57600, 0x908af79d
+0,         27,         27,        1,    57600, 0x4ec4a868
+0,         28,         28,        1,    57600, 0x7db370a1
+0,         29,         29,        1,    57600, 0x2b1e52f6
+0,         30,         30,        1,    57600, 0x2141467c