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, 77 insertions, 76 deletions

diff --git a/tests/ref/fate/mimic b/tests/ref/fate/mimic
index b977ac5b8d..217d487b10 100644
--- a/tests/ref/fate/mimic
+++ b/tests/ref/fate/mimic
@@ -1,76 +1,77 @@
-0, 0, 115200, 0xa974d407
-0, 49320, 115200, 0x72618b84
-0, 97920, 115200, 0x87768573
-0, 158310, 115200, 0x5d218e3e
-0, 219330, 115200, 0x0c0db41c
-0, 276840, 115200, 0xb777fd48
-0, 351720, 115200, 0x40765de7
-0, 409050, 115200, 0x370a3c90
-0, 458280, 115200, 0xc605785a
-0, 541440, 115200, 0x49468b23
-0, 590400, 115200, 0x986b6fd4
-0, 688320, 115200, 0x30f22ef8
-0, 734760, 115200, 0xa90bd608
-0, 795240, 115200, 0x9cf36518
-0, 866880, 115200, 0x4ef1a679
-0, 892980, 115200, 0x0df65873
-0, 928440, 115200, 0xfecd4233
-0, 999360, 115200, 0xee2f26cb
-0, 1059840, 115200, 0x795f612d
-0, 1108890, 115200, 0xbbb90125
-0, 1169280, 115200, 0x9230fb6e
-0, 1242450, 115200, 0x11869996
-0, 1302120, 115200, 0x6b5c892b
-0, 1362240, 115200, 0x88bdb9cd
-0, 1434330, 115200, 0x364bc5a0
-0, 1494720, 115200, 0x6b66d817
-0, 1555290, 115200, 0xd3a41252
-0, 1628010, 115200, 0x0cf5612f
-0, 1687860, 115200, 0x9752d055
-0, 1782720, 115200, 0x486e9f6f
-0, 1843560, 115200, 0x3eab62f8
-0, 1892790, 115200, 0xa7f52762
-0, 1976130, 115200, 0xfd4c4bbc
-0, 2024820, 115200, 0x194023f6
-0, 2059200, 115200, 0xd4668dad
-0, 2131200, 115200, 0x6b20d64b
-0, 2191770, 115200, 0xf2572aae
-0, 2241090, 115200, 0xc3554f25
-0, 2312550, 115200, 0xeeb5073a
-0, 2384550, 115200, 0xbd46291f
-0, 2433600, 115200, 0x0526838d
-0, 2529630, 115200, 0x85b2e864
-0, 2590020, 115200, 0xcfd894bc
-0, 2638440, 115200, 0x644f10fb
-0, 2721600, 115200, 0x556e4d88
-0, 2770740, 115200, 0x93243614
-0, 2878470, 115200, 0x754275c5
-0, 2963610, 115200, 0x7f648bf3
-0, 3024000, 115200, 0xece18c9b
-0, 3084390, 115200, 0x385d52c1
-0, 3168090, 115200, 0xafc58e4a
-0, 3216870, 115200, 0x50daf750
-0, 3274560, 115200, 0xf6bc67d1
-0, 3360960, 115200, 0xb64b6e07
-0, 3422520, 115200, 0x8751ed15
-0, 3479130, 115200, 0x329ce803
-0, 3540060, 115200, 0x40b2cb05
-0, 3611610, 115200, 0x60f3517d
-0, 3672180, 115200, 0xe0d46fdf
-0, 3732480, 115200, 0x204529fa
-0, 3804840, 115200, 0xd5afaf22
-0, 3864960, 115200, 0xd3cb3d4c
-0, 3925440, 115200, 0x87973a79
-0, 3997890, 115200, 0xe3b2f917
-0, 4058280, 115200, 0xf1923238
-0, 4106880, 115200, 0x51494d71
-0, 4190490, 115200, 0x58bc59bb
-0, 4239450, 115200, 0xd0273fdb
-0, 4299840, 115200, 0x6cc79700
-0, 4346460, 115200, 0xc8172d31
-0, 4406400, 115200, 0x8eb037ef
-0, 4455360, 115200, 0xc0bc2d76
-0, 4504770, 115200, 0x663c467a
-0, 4553730, 115200, 0xd085e950
-0, 4636800, 115200, 0x7d198d72
-0, 4688280, 115200, 0x6ebacda0
+#tb 0: 1/1000
+0,          0,          0,        0,   115200, 0xa974d407
+0,        548,        548,        0,   115200, 0x72618b84
+0,       1088,       1088,        0,   115200, 0x87768573
+0,       1759,       1759,        0,   115200, 0x5d218e3e
+0,       2437,       2437,        0,   115200, 0x0c0db41c
+0,       3076,       3076,        0,   115200, 0xb777fd48
+0,       3908,       3908,        0,   115200, 0x40765de7
+0,       4545,       4545,        0,   115200, 0x370a3c90
+0,       5092,       5092,        0,   115200, 0xc605785a
+0,       6016,       6016,        0,   115200, 0x49468b23
+0,       6560,       6560,        0,   115200, 0x986b6fd4
+0,       7648,       7648,        0,   115200, 0x30f22ef8
+0,       8164,       8164,        0,   115200, 0xa90bd608
+0,       8836,       8836,        0,   115200, 0x9cf36518
+0,       9632,       9632,        0,   115200, 0x4ef1a679
+0,       9922,       9922,        0,   115200, 0x0df65873
+0,      10316,      10316,        0,   115200, 0xfecd4233
+0,      11104,      11104,        0,   115200, 0xee2f26cb
+0,      11776,      11776,        0,   115200, 0x795f612d
+0,      12321,      12321,        0,   115200, 0xbbb90125
+0,      12992,      12992,        0,   115200, 0x9230fb6e
+0,      13805,      13805,        0,   115200, 0x11869996
+0,      14468,      14468,        0,   115200, 0x6b5c892b
+0,      15136,      15136,        0,   115200, 0x88bdb9cd
+0,      15937,      15937,        0,   115200, 0x364bc5a0
+0,      16608,      16608,        0,   115200, 0x6b66d817
+0,      17281,      17281,        0,   115200, 0xd3a41252
+0,      18089,      18089,        0,   115200, 0x0cf5612f
+0,      18754,      18754,        0,   115200, 0x9752d055
+0,      19808,      19808,        0,   115200, 0x486e9f6f
+0,      20484,      20484,        0,   115200, 0x3eab62f8
+0,      21031,      21031,        0,   115200, 0xa7f52762
+0,      21957,      21957,        0,   115200, 0xfd4c4bbc
+0,      22498,      22498,        0,   115200, 0x194023f6
+0,      22880,      22880,        0,   115200, 0xd4668dad
+0,      23680,      23680,        0,   115200, 0x6b20d64b
+0,      24353,      24353,        0,   115200, 0xf2572aae
+0,      24901,      24901,        0,   115200, 0xc3554f25
+0,      25695,      25695,        0,   115200, 0xeeb5073a
+0,      26495,      26495,        0,   115200, 0xbd46291f
+0,      27040,      27040,        0,   115200, 0x0526838d
+0,      28107,      28107,        0,   115200, 0x85b2e864
+0,      28778,      28778,        0,   115200, 0xcfd894bc
+0,      29316,      29316,        0,   115200, 0x644f10fb
+0,      30240,      30240,        0,   115200, 0x556e4d88
+0,      30786,      30786,        0,   115200, 0x93243614
+0,      31983,      31983,        0,   115200, 0x754275c5
+0,      32929,      32929,        0,   115200, 0x7f648bf3
+0,      33600,      33600,        0,   115200, 0xece18c9b
+0,      34271,      34271,        0,   115200, 0x385d52c1
+0,      35201,      35201,        0,   115200, 0xafc58e4a
+0,      35743,      35743,        0,   115200, 0x50daf750
+0,      36384,      36384,        0,   115200, 0xf6bc67d1
+0,      37344,      37344,        0,   115200, 0xb64b6e07
+0,      38028,      38028,        0,   115200, 0x8751ed15
+0,      38657,      38657,        0,   115200, 0x329ce803
+0,      39334,      39334,        0,   115200, 0x40b2cb05
+0,      40129,      40129,        0,   115200, 0x60f3517d
+0,      40802,      40802,        0,   115200, 0xe0d46fdf
+0,      41472,      41472,        0,   115200, 0x204529fa
+0,      42276,      42276,        0,   115200, 0xd5afaf22
+0,      42944,      42944,        0,   115200, 0xd3cb3d4c
+0,      43616,      43616,        0,   115200, 0x87973a79
+0,      44421,      44421,        0,   115200, 0xe3b2f917
+0,      45092,      45092,        0,   115200, 0xf1923238
+0,      45632,      45632,        0,   115200, 0x51494d71
+0,      46561,      46561,        0,   115200, 0x58bc59bb
+0,      47105,      47105,        0,   115200, 0xd0273fdb
+0,      47776,      47776,        0,   115200, 0x6cc79700
+0,      48294,      48294,        0,   115200, 0xc8172d31
+0,      48960,      48960,        0,   115200, 0x8eb037ef
+0,      49504,      49504,        0,   115200, 0xc0bc2d76
+0,      50053,      50053,        0,   115200, 0x663c467a
+0,      50597,      50597,        0,   115200, 0xd085e950
+0,      51520,      51520,        0,   115200, 0x7d198d72
+0,      52092,      52092,        0,   115200, 0x6ebacda0