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, 41 insertions, 40 deletions

diff --git a/tests/ref/fate/videoxl b/tests/ref/fate/videoxl
index aca08645a7..4d2db37f3e 100644
--- a/tests/ref/fate/videoxl
+++ b/tests/ref/fate/videoxl
@@ -1,40 +1,41 @@
-0, 0, 36096, 0xab1c53c1
-0, 12780, 36096, 0x8b598ff3
-0, 25560, 36096, 0xe9a5f3eb
-0, 38340, 36096, 0x10584b30
-0, 51120, 36096, 0x19d8c5d2
-0, 63900, 36096, 0x43a453b9
-0, 76680, 36096, 0xb32db13b
-0, 89460, 36096, 0xf117e7b3
-0, 102240, 36096, 0x9171fb33
-0, 115020, 36096, 0xdf84081c
-0, 127800, 36096, 0xc9d9527e
-0, 140580, 36096, 0x72fa295e
-0, 153360, 36096, 0xce02060e
-0, 166140, 36096, 0x31f5fdbd
-0, 178920, 36096, 0x4179dc07
-0, 191700, 36096, 0xf250c03f
-0, 204480, 36096, 0xc4aca7c5
-0, 217260, 36096, 0xd9b1837f
-0, 230040, 36096, 0x0af164ef
-0, 242820, 36096, 0x90123fcd
-0, 255600, 36096, 0x60392815
-0, 268380, 36096, 0x7a7b0ac9
-0, 281160, 36096, 0x36c1fe9c
-0, 293940, 36096, 0x50bed8a4
-0, 306720, 36096, 0x10f3b998
-0, 319500, 36096, 0x18e5b516
-0, 332280, 36096, 0x860597dc
-0, 345060, 36096, 0x05488146
-0, 357840, 36096, 0xac577cec
-0, 370620, 36096, 0xc9f95550
-0, 383400, 36096, 0xa0c95270
-0, 396180, 36096, 0x977c5bf2
-0, 408960, 36096, 0xc9f95550
-0, 421740, 36096, 0xa0c95270
-0, 434520, 36096, 0x977c5bf2
-0, 447300, 36096, 0xc9f95550
-0, 460080, 36096, 0xa0c95270
-0, 472860, 36096, 0x977c5bf2
-0, 485640, 36096, 0xc9f95550
-0, 498420, 36096, 0xa0c95270
+#tb 0: 71/500
+0,          0,          0,        1,    36096, 0xab1c53c1
+0,          1,          1,        1,    36096, 0x8b598ff3
+0,          2,          2,        1,    36096, 0xe9a5f3eb
+0,          3,          3,        1,    36096, 0x10584b30
+0,          4,          4,        1,    36096, 0x19d8c5d2
+0,          5,          5,        1,    36096, 0x43a453b9
+0,          6,          6,        1,    36096, 0xb32db13b
+0,          7,          7,        1,    36096, 0xf117e7b3
+0,          8,          8,        1,    36096, 0x9171fb33
+0,          9,          9,        1,    36096, 0xdf84081c
+0,         10,         10,        1,    36096, 0xc9d9527e
+0,         11,         11,        1,    36096, 0x72fa295e
+0,         12,         12,        1,    36096, 0xce02060e
+0,         13,         13,        1,    36096, 0x31f5fdbd
+0,         14,         14,        1,    36096, 0x4179dc07
+0,         15,         15,        1,    36096, 0xf250c03f
+0,         16,         16,        1,    36096, 0xc4aca7c5
+0,         17,         17,        1,    36096, 0xd9b1837f
+0,         18,         18,        1,    36096, 0x0af164ef
+0,         19,         19,        1,    36096, 0x90123fcd
+0,         20,         20,        1,    36096, 0x60392815
+0,         21,         21,        1,    36096, 0x7a7b0ac9
+0,         22,         22,        1,    36096, 0x36c1fe9c
+0,         23,         23,        1,    36096, 0x50bed8a4
+0,         24,         24,        1,    36096, 0x10f3b998
+0,         25,         25,        1,    36096, 0x18e5b516
+0,         26,         26,        1,    36096, 0x860597dc
+0,         27,         27,        1,    36096, 0x05488146
+0,         28,         28,        1,    36096, 0xac577cec
+0,         29,         29,        1,    36096, 0xc9f95550
+0,         30,         30,        1,    36096, 0xa0c95270
+0,         31,         31,        1,    36096, 0x977c5bf2
+0,         32,         32,        1,    36096, 0xc9f95550
+0,         33,         33,        1,    36096, 0xa0c95270
+0,         34,         34,        1,    36096, 0x977c5bf2
+0,         35,         35,        1,    36096, 0xc9f95550
+0,         36,         36,        1,    36096, 0xa0c95270
+0,         37,         37,        1,    36096, 0x977c5bf2
+0,         38,         38,        1,    36096, 0xc9f95550
+0,         39,         39,        1,    36096, 0xa0c95270