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, 66 insertions, 64 deletions

diff --git a/tests/ref/fate/dxa-feeble b/tests/ref/fate/dxa-feeble
index caea4c2e2a..4dde7b9dd0 100644
--- a/tests/ref/fate/dxa-feeble
+++ b/tests/ref/fate/dxa-feeble
@@ -1,64 +1,66 @@
-0, 0, 921600, 0x0d03844f
-1, 0, 1000, 0x64cd9403
-1, 4082, 1000, 0xa4ef8a9d
-1, 8163, 1000, 0x75c19868
-0, 9000, 921600, 0x0d03844f
-1, 12245, 1000, 0x93db6f79
-1, 16327, 1000, 0x6835625d
-0, 18000, 921600, 0x649cdcea
-1, 20408, 1000, 0xb3affa8f
-1, 24490, 1000, 0x159fdcc8
-0, 27000, 921600, 0x649cdcea
-1, 28571, 1000, 0x79f9f7f1
-1, 32653, 1000, 0xd7d1131e
-0, 36000, 921600, 0x9c7f22e8
-1, 36735, 1000, 0x52a6f797
-1, 40816, 1000, 0x748202ca
-1, 44898, 1000, 0x0ef92449
-0, 45000, 921600, 0x9c7f22e8
-1, 48980, 1000, 0x6a3760ab
-1, 53061, 1000, 0xce5c5abf
-0, 54000, 921600, 0x3451514a
-1, 57143, 1000, 0x23396792
-1, 61224, 1000, 0xa5276238
-0, 63000, 921600, 0x3451514a
-1, 65306, 1000, 0x288adf1b
-1, 69388, 1000, 0xe7de6fb2
-0, 72000, 921600, 0x8f19f600
-1, 73469, 1000, 0x2c2c707f
-1, 77551, 1000, 0xd66d6daf
-0, 81000, 921600, 0x8f19f600
-1, 81633, 1000, 0xbcea7d64
-1, 85714, 1000, 0x766feea5
-1, 89796, 1000, 0xd2e1d63a
-0, 90000, 921600, 0x07e7445b
-1, 93878, 1000, 0x2f7ef4ed
-1, 97959, 1000, 0xb655cba4
-0, 99000, 921600, 0x07e7445b
-1, 102041, 1000, 0x4507d37b
-1, 106122, 1000, 0x0c57f794
-0, 108000, 921600, 0x873d1227
-1, 110204, 1000, 0x0ecbe5cc
-1, 114286, 1000, 0x9bf6e345
-0, 117000, 921600, 0x873d1227
-1, 118367, 1000, 0xc461443c
-1, 122449, 1000, 0xad9657bf
-0, 126000, 921600, 0xbef62d86
-1, 126531, 1000, 0x466fe91c
-1, 130612, 1000, 0x9ee377fe
-1, 134694, 1000, 0x09956428
-0, 135000, 921600, 0xbef62d86
-1, 138776, 1000, 0x9b285f0a
-1, 142857, 1000, 0x0a3e61a6
-0, 144000, 921600, 0xcf84fee4
-1, 146939, 1000, 0xacc25d6b
-1, 151020, 1000, 0x377be319
-0, 153000, 921600, 0xcf84fee4
-1, 155102, 1000, 0xe4890504
-1, 159184, 1000, 0xe90a6497
-0, 162000, 921600, 0x5639e670
-1, 163265, 1000, 0xd00fe950
-1, 167347, 1000, 0xf195eb44
-0, 171000, 921600, 0x5639e670
-1, 171429, 1000, 0xa491f3ef
-1, 175510, 1000, 0x2c036e18
+#tb 0: 1/10
+#tb 1: 1/11025
+0,          0,          0,        1,   921600, 0x0d03844f
+1,          0,          0,      500,     1000, 0x64cd9403
+1,        500,        500,      500,     1000, 0xa4ef8a9d
+1,       1000,       1000,      500,     1000, 0x75c19868
+0,          1,          1,        1,   921600, 0x0d03844f
+1,       1500,       1500,      500,     1000, 0x93db6f79
+1,       2000,       2000,      500,     1000, 0x6835625d
+0,          2,          2,        1,   921600, 0x649cdcea
+1,       2500,       2500,      500,     1000, 0xb3affa8f
+1,       3000,       3000,      500,     1000, 0x159fdcc8
+0,          3,          3,        1,   921600, 0x649cdcea
+1,       3500,       3500,      500,     1000, 0x79f9f7f1
+1,       4000,       4000,      500,     1000, 0xd7d1131e
+0,          4,          4,        1,   921600, 0x9c7f22e8
+1,       4500,       4500,      500,     1000, 0x52a6f797
+1,       5000,       5000,      500,     1000, 0x748202ca
+1,       5500,       5500,      500,     1000, 0x0ef92449
+0,          5,          5,        1,   921600, 0x9c7f22e8
+1,       6000,       6000,      500,     1000, 0x6a3760ab
+1,       6500,       6500,      500,     1000, 0xce5c5abf
+0,          6,          6,        1,   921600, 0x3451514a
+1,       7000,       7000,      500,     1000, 0x23396792
+1,       7500,       7500,      500,     1000, 0xa5276238
+0,          7,          7,        1,   921600, 0x3451514a
+1,       8000,       8000,      500,     1000, 0x288adf1b
+1,       8500,       8500,      500,     1000, 0xe7de6fb2
+0,          8,          8,        1,   921600, 0x8f19f600
+1,       9000,       9000,      500,     1000, 0x2c2c707f
+1,       9500,       9500,      500,     1000, 0xd66d6daf
+0,          9,          9,        1,   921600, 0x8f19f600
+1,      10000,      10000,      500,     1000, 0xbcea7d64
+1,      10500,      10500,      500,     1000, 0x766feea5
+1,      11000,      11000,      500,     1000, 0xd2e1d63a
+0,         10,         10,        1,   921600, 0x07e7445b
+1,      11500,      11500,      500,     1000, 0x2f7ef4ed
+1,      12000,      12000,      500,     1000, 0xb655cba4
+0,         11,         11,        1,   921600, 0x07e7445b
+1,      12500,      12500,      500,     1000, 0x4507d37b
+1,      13000,      13000,      500,     1000, 0x0c57f794
+0,         12,         12,        1,   921600, 0x873d1227
+1,      13500,      13500,      500,     1000, 0x0ecbe5cc
+1,      14000,      14000,      500,     1000, 0x9bf6e345
+0,         13,         13,        1,   921600, 0x873d1227
+1,      14500,      14500,      500,     1000, 0xc461443c
+1,      15000,      15000,      500,     1000, 0xad9657bf
+0,         14,         14,        1,   921600, 0xbef62d86
+1,      15500,      15500,      500,     1000, 0x466fe91c
+1,      16000,      16000,      500,     1000, 0x9ee377fe
+1,      16500,      16500,      500,     1000, 0x09956428
+0,         15,         15,        1,   921600, 0xbef62d86
+1,      17000,      17000,      500,     1000, 0x9b285f0a
+1,      17500,      17500,      500,     1000, 0x0a3e61a6
+0,         16,         16,        1,   921600, 0xcf84fee4
+1,      18000,      18000,      500,     1000, 0xacc25d6b
+1,      18500,      18500,      500,     1000, 0x377be319
+0,         17,         17,        1,   921600, 0xcf84fee4
+1,      19000,      19000,      500,     1000, 0xe4890504
+1,      19500,      19500,      500,     1000, 0xe90a6497
+0,         18,         18,        1,   921600, 0x5639e670
+1,      20000,      20000,      500,     1000, 0xd00fe950
+1,      20500,      20500,      500,     1000, 0xf195eb44
+0,         19,         19,        1,   921600, 0x5639e670
+1,      21000,      21000,      500,     1000, 0xa491f3ef
+1,      21500,      21500,      500,     1000, 0x2c036e18