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

diff --git a/tests/ref/fate/truemotion2 b/tests/ref/fate/truemotion2
index e7c4ee47f4..c263ba4580 100644
--- a/tests/ref/fate/truemotion2
+++ b/tests/ref/fate/truemotion2
@@ -1,30 +1,31 @@
-0, 0, 230400, 0x135cb509
-0, 6000, 230400, 0x919a1ab7
-0, 12000, 230400, 0x0af8722b
-0, 18000, 230400, 0xc9616809
-0, 24000, 230400, 0xe16ecaf7
-0, 30000, 230400, 0xa86f8d1b
-0, 36000, 230400, 0xd351b5a4
-0, 42000, 230400, 0xd112b5b7
-0, 48000, 230400, 0xc9c3c9b1
-0, 54000, 230400, 0x4f91e572
-0, 60000, 230400, 0xb1d8c4d3
-0, 66000, 230400, 0x34de10c1
-0, 72000, 230400, 0xbd4f3b29
-0, 78000, 230400, 0xfeaf1477
-0, 84000, 230400, 0x718ffa17
-0, 90000, 230400, 0x23b46ef3
-0, 96000, 230400, 0x6346d9b8
-0, 102000, 230400, 0xdb66bf57
-0, 108000, 230400, 0xeb74a2ff
-0, 114000, 230400, 0xe0750470
-0, 120000, 230400, 0x645eb109
-0, 126000, 230400, 0xbb96489a
-0, 132000, 230400, 0x58a70e35
-0, 138000, 230400, 0xc7563441
-0, 144000, 230400, 0x6098f07e
-0, 150000, 230400, 0x579ece15
-0, 156000, 230400, 0xe1ca8d03
-0, 162000, 230400, 0x8928cf34
-0, 168000, 230400, 0xf621620e
-0, 174000, 230400, 0x98a344ea
+#tb 0: 1/15
+0,          0,          0,        1,   230400, 0x135cb509
+0,          1,          1,        1,   230400, 0x919a1ab7
+0,          2,          2,        1,   230400, 0x0af8722b
+0,          3,          3,        1,   230400, 0xc9616809
+0,          4,          4,        1,   230400, 0xe16ecaf7
+0,          5,          5,        1,   230400, 0xa86f8d1b
+0,          6,          6,        1,   230400, 0xd351b5a4
+0,          7,          7,        1,   230400, 0xd112b5b7
+0,          8,          8,        1,   230400, 0xc9c3c9b1
+0,          9,          9,        1,   230400, 0x4f91e572
+0,         10,         10,        1,   230400, 0xb1d8c4d3
+0,         11,         11,        1,   230400, 0x34de10c1
+0,         12,         12,        1,   230400, 0xbd4f3b29
+0,         13,         13,        1,   230400, 0xfeaf1477
+0,         14,         14,        1,   230400, 0x718ffa17
+0,         15,         15,        1,   230400, 0x23b46ef3
+0,         16,         16,        1,   230400, 0x6346d9b8
+0,         17,         17,        1,   230400, 0xdb66bf57
+0,         18,         18,        1,   230400, 0xeb74a2ff
+0,         19,         19,        1,   230400, 0xe0750470
+0,         20,         20,        1,   230400, 0x645eb109
+0,         21,         21,        1,   230400, 0xbb96489a
+0,         22,         22,        1,   230400, 0x58a70e35
+0,         23,         23,        1,   230400, 0xc7563441
+0,         24,         24,        1,   230400, 0x6098f07e
+0,         25,         25,        1,   230400, 0x579ece15
+0,         26,         26,        1,   230400, 0xe1ca8d03
+0,         27,         27,        1,   230400, 0x8928cf34
+0,         28,         28,        1,   230400, 0xf621620e
+0,         29,         29,        1,   230400, 0x98a344ea