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, 46 insertions, 44 deletions

diff --git a/tests/ref/fate/truemotion1-24 b/tests/ref/fate/truemotion1-24
index 55576ee6ae..7ab2f63820 100644
--- a/tests/ref/fate/truemotion1-24
+++ b/tests/ref/fate/truemotion1-24
@@ -1,44 +1,46 @@
-0, 0, 69120, 0x68beb30f
-1, 0, 10836, 0xedecb6a7
-1, 5529, 10836, 0x8098a323
-0, 6000, 69120, 0x3976f5cf
-1, 11057, 10836, 0xcfa1112e
-0, 12000, 69120, 0xf815bc3c
-1, 16586, 10836, 0xe241ede4
-0, 18000, 69120, 0xa7cc0ae6
-1, 22114, 10836, 0xddf254bb
-0, 24000, 69120, 0xd85ac282
-1, 27643, 10836, 0xa16c8507
-0, 30000, 69120, 0xf7fd7edb
-1, 33171, 10836, 0xbe211f93
-0, 36000, 69120, 0x433bb6f6
-1, 38700, 10836, 0x26c7283d
-0, 42000, 69120, 0xdbac8bee
-1, 44229, 10836, 0x4d18be56
-0, 48000, 69120, 0x88e2a799
-1, 49757, 10836, 0x57b9af6f
-0, 54000, 69120, 0x49617b26
-1, 55286, 10836, 0xd5864280
-0, 60000, 69120, 0xeb44ca01
-1, 60814, 10836, 0xd582b451
-0, 66000, 69120, 0x6fea37e8
-1, 66343, 10836, 0xec13731d
-1, 71871, 10836, 0xe3d4fbb8
-0, 72000, 69120, 0xf55d74c7
-1, 77400, 10836, 0xcbb54d18
-0, 78000, 69120, 0xb5082ca7
-1, 82929, 10836, 0xff7e7133
-0, 84000, 69120, 0x5876d758
-1, 88457, 10836, 0xcc28b1a7
-0, 90000, 69120, 0x45e7dd5c
-1, 93986, 10836, 0xbf9e07a5
-1, 99514, 10836, 0x16408f38
-1, 105043, 10836, 0x2b000c9f
-1, 110571, 10836, 0x0ccd9811
-1, 116100, 10836, 0xf9575d48
-1, 121629, 10836, 0x1ee68190
-1, 127157, 10836, 0xde435373
-1, 132686, 10836, 0xd83be17a
-1, 138214, 10836, 0x9a7f0bbe
-1, 143743, 10836, 0x8709e4d3
-1, 149271, 10836, 0xde1879cb
+#tb 0: 1/15
+#tb 1: 1/44100
+0,          0,          0,        1,    69120, 0x68beb30f
+1,          0,          0,     2709,    10836, 0xedecb6a7
+1,       2709,       2709,     2709,    10836, 0x8098a323
+0,          1,          1,        1,    69120, 0x3976f5cf
+1,       5418,       5418,     2709,    10836, 0xcfa1112e
+0,          2,          2,        1,    69120, 0xf815bc3c
+1,       8127,       8127,     2709,    10836, 0xe241ede4
+0,          3,          3,        1,    69120, 0xa7cc0ae6
+1,      10836,      10836,     2709,    10836, 0xddf254bb
+0,          4,          4,        1,    69120, 0xd85ac282
+1,      13545,      13545,     2709,    10836, 0xa16c8507
+0,          5,          5,        1,    69120, 0xf7fd7edb
+1,      16254,      16254,     2709,    10836, 0xbe211f93
+0,          6,          6,        1,    69120, 0x433bb6f6
+1,      18963,      18963,     2709,    10836, 0x26c7283d
+0,          7,          7,        1,    69120, 0xdbac8bee
+1,      21672,      21672,     2709,    10836, 0x4d18be56
+0,          8,          8,        1,    69120, 0x88e2a799
+1,      24381,      24381,     2709,    10836, 0x57b9af6f
+0,          9,          9,        1,    69120, 0x49617b26
+1,      27090,      27090,     2709,    10836, 0xd5864280
+0,         10,         10,        1,    69120, 0xeb44ca01
+1,      29799,      29799,     2709,    10836, 0xd582b451
+0,         11,         11,        1,    69120, 0x6fea37e8
+1,      32508,      32508,     2709,    10836, 0xec13731d
+1,      35217,      35217,     2709,    10836, 0xe3d4fbb8
+0,         12,         12,        1,    69120, 0xf55d74c7
+1,      37926,      37926,     2709,    10836, 0xcbb54d18
+0,         13,         13,        1,    69120, 0xb5082ca7
+1,      40635,      40635,     2709,    10836, 0xff7e7133
+0,         14,         14,        1,    69120, 0x5876d758
+1,      43344,      43344,     2709,    10836, 0xcc28b1a7
+0,         15,         15,        1,    69120, 0x45e7dd5c
+1,      46053,      46053,     2709,    10836, 0xbf9e07a5
+1,      48762,      48762,     2709,    10836, 0x16408f38
+1,      51471,      51471,     2709,    10836, 0x2b000c9f
+1,      54180,      54180,     2709,    10836, 0x0ccd9811
+1,      56889,      56889,     2709,    10836, 0xf9575d48
+1,      59598,      59598,     2709,    10836, 0x1ee68190
+1,      62307,      62307,     2709,    10836, 0xde435373
+1,      65016,      65016,     2709,    10836, 0xd83be17a
+1,      67725,      67725,     2709,    10836, 0x9a7f0bbe
+1,      70434,      70434,     2709,    10836, 0x8709e4d3
+1,      73143,      73143,     2709,    10836, 0xde1879cb