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, 63 insertions, 62 deletions

diff --git a/tests/ref/fate/ulti b/tests/ref/fate/ulti
index 820dcfda1c..4e9968b6df 100644
--- a/tests/ref/fate/ulti
+++ b/tests/ref/fate/ulti
@@ -1,62 +1,63 @@
-0, 0, 86400, 0x5d58253d
-0, 7500, 86400, 0x0626d90d
-0, 15000, 86400, 0x4ecb5048
-0, 22500, 86400, 0xf54ea8f7
-0, 30000, 86400, 0xa777c21b
-0, 37500, 86400, 0x7d71e329
-0, 45000, 86400, 0x2903252a
-0, 52500, 86400, 0xbe7302c1
-0, 60000, 86400, 0x734423a8
-0, 67500, 86400, 0x4f422bab
-0, 75000, 86400, 0x21fbf200
-0, 82500, 86400, 0xabf299a7
-0, 90000, 86400, 0x400b4bf8
-0, 97500, 86400, 0x61d044f9
-0, 105000, 86400, 0x72fb94af
-0, 112500, 86400, 0xf522e717
-0, 120000, 86400, 0xad3e0297
-0, 127500, 86400, 0xbef57a5f
-0, 135000, 86400, 0x450ca6e7
-0, 142500, 86400, 0x76ae56e6
-0, 150000, 86400, 0x7b9b7555
-0, 157500, 86400, 0xb522ce0d
-0, 165000, 86400, 0xaa9b8536
-0, 172500, 86400, 0x019d00c4
-0, 180000, 86400, 0xb0f4dee5
-0, 187500, 86400, 0xa7482e52
-0, 195000, 86400, 0x3c87fc35
-0, 202500, 86400, 0xb6d1dede
-0, 210000, 86400, 0x926ee647
-0, 217500, 86400, 0x8747bfc7
-0, 225000, 86400, 0x61569e9b
-0, 232500, 86400, 0x9209a5f6
-0, 240000, 86400, 0x5f89ef12
-0, 247500, 86400, 0x00bfc18f
-0, 255000, 86400, 0xcc6f2f62
-0, 262500, 86400, 0x3ab9cfbf
-0, 270000, 86400, 0x936f2386
-0, 277500, 86400, 0x2203a76c
-0, 285000, 86400, 0xd3d248a3
-0, 292500, 86400, 0x148af7b8
-0, 300000, 86400, 0x437bffae
-0, 307500, 86400, 0x6876c6d5
-0, 315000, 86400, 0x49fc1429
-0, 322500, 86400, 0x181efd2c
-0, 330000, 86400, 0x26ecd294
-0, 337500, 86400, 0xdcdb609e
-0, 345000, 86400, 0xd3cb0ecb
-0, 352500, 86400, 0x528ffc4b
-0, 360000, 86400, 0xb536c7b4
-0, 367500, 86400, 0xae4ab8c5
-0, 375000, 86400, 0xe14fee77
-0, 382500, 86400, 0xcd3e9e85
-0, 390000, 86400, 0x71cfba54
-0, 397500, 86400, 0x9b309c62
-0, 405000, 86400, 0x91b31881
-0, 412500, 86400, 0xae8bda28
-0, 420000, 86400, 0x8db0f87a
-0, 427500, 86400, 0xcd974e98
-0, 435000, 86400, 0x4405116e
-0, 442500, 86400, 0xfe4cc7b4
-0, 450000, 86400, 0x17d27206
-0, 457500, 86400, 0x11743762
+#tb 0: 1/12
+0,          0,          0,        1,    86400, 0x5d58253d
+0,          1,          1,        1,    86400, 0x0626d90d
+0,          2,          2,        1,    86400, 0x4ecb5048
+0,          3,          3,        1,    86400, 0xf54ea8f7
+0,          4,          4,        1,    86400, 0xa777c21b
+0,          5,          5,        1,    86400, 0x7d71e329
+0,          6,          6,        1,    86400, 0x2903252a
+0,          7,          7,        1,    86400, 0xbe7302c1
+0,          8,          8,        1,    86400, 0x734423a8
+0,          9,          9,        1,    86400, 0x4f422bab
+0,         10,         10,        1,    86400, 0x21fbf200
+0,         11,         11,        1,    86400, 0xabf299a7
+0,         12,         12,        1,    86400, 0x400b4bf8
+0,         13,         13,        1,    86400, 0x61d044f9
+0,         14,         14,        1,    86400, 0x72fb94af
+0,         15,         15,        1,    86400, 0xf522e717
+0,         16,         16,        1,    86400, 0xad3e0297
+0,         17,         17,        1,    86400, 0xbef57a5f
+0,         18,         18,        1,    86400, 0x450ca6e7
+0,         19,         19,        1,    86400, 0x76ae56e6
+0,         20,         20,        1,    86400, 0x7b9b7555
+0,         21,         21,        1,    86400, 0xb522ce0d
+0,         22,         22,        1,    86400, 0xaa9b8536
+0,         23,         23,        1,    86400, 0x019d00c4
+0,         24,         24,        1,    86400, 0xb0f4dee5
+0,         25,         25,        1,    86400, 0xa7482e52
+0,         26,         26,        1,    86400, 0x3c87fc35
+0,         27,         27,        1,    86400, 0xb6d1dede
+0,         28,         28,        1,    86400, 0x926ee647
+0,         29,         29,        1,    86400, 0x8747bfc7
+0,         30,         30,        1,    86400, 0x61569e9b
+0,         31,         31,        1,    86400, 0x9209a5f6
+0,         32,         32,        1,    86400, 0x5f89ef12
+0,         33,         33,        1,    86400, 0x00bfc18f
+0,         34,         34,        1,    86400, 0xcc6f2f62
+0,         35,         35,        1,    86400, 0x3ab9cfbf
+0,         36,         36,        1,    86400, 0x936f2386
+0,         37,         37,        1,    86400, 0x2203a76c
+0,         38,         38,        1,    86400, 0xd3d248a3
+0,         39,         39,        1,    86400, 0x148af7b8
+0,         40,         40,        1,    86400, 0x437bffae
+0,         41,         41,        1,    86400, 0x6876c6d5
+0,         42,         42,        1,    86400, 0x49fc1429
+0,         43,         43,        1,    86400, 0x181efd2c
+0,         44,         44,        1,    86400, 0x26ecd294
+0,         45,         45,        1,    86400, 0xdcdb609e
+0,         46,         46,        1,    86400, 0xd3cb0ecb
+0,         47,         47,        1,    86400, 0x528ffc4b
+0,         48,         48,        1,    86400, 0xb536c7b4
+0,         49,         49,        1,    86400, 0xae4ab8c5
+0,         50,         50,        1,    86400, 0xe14fee77
+0,         51,         51,        1,    86400, 0xcd3e9e85
+0,         52,         52,        1,    86400, 0x71cfba54
+0,         53,         53,        1,    86400, 0x9b309c62
+0,         54,         54,        1,    86400, 0x91b31881
+0,         55,         55,        1,    86400, 0xae8bda28
+0,         56,         56,        1,    86400, 0x8db0f87a
+0,         57,         57,        1,    86400, 0xcd974e98
+0,         58,         58,        1,    86400, 0x4405116e
+0,         59,         59,        1,    86400, 0xfe4cc7b4
+0,         60,         60,        1,    86400, 0x17d27206
+0,         61,         61,        1,    86400, 0x11743762