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

diff --git a/tests/ref/fate/msrle-8bit b/tests/ref/fate/msrle-8bit
index b2374cd21c..5db1c244fa 100644
--- a/tests/ref/fate/msrle-8bit
+++ b/tests/ref/fate/msrle-8bit
@@ -1,29 +1,30 @@
-0, 0, 11520, 0xaf416a66
-0, 15000, 11520, 0x8ab76654
-0, 30000, 11520, 0xd22880c4
-0, 45000, 11520, 0x9d2f612a
-0, 60000, 11520, 0xf538600a
-0, 75000, 11520, 0x371d64e6
-0, 90000, 11520, 0x49043fbf
-0, 105000, 11520, 0x49043fbf
-0, 120000, 11520, 0x12d16528
-0, 134999, 11520, 0x1e0a6109
-0, 149999, 11520, 0x9d2f612a
-0, 164999, 11520, 0x96e083ca
-0, 179999, 11520, 0x8ab76654
-0, 194999, 11520, 0x43ac6de7
-0, 209999, 11520, 0x43ac6de7
-0, 224999, 11520, 0x5c3e6819
-0, 239999, 11520, 0x22758af0
-0, 254999, 11520, 0x88845eba
-0, 269999, 11520, 0x4b38848a
-0, 284999, 11520, 0x4f7495d3
-0, 299999, 11520, 0x736b702c
-0, 314999, 11520, 0x736b702c
-0, 329999, 11520, 0x4f7495d3
-0, 344999, 11520, 0x4b38848a
-0, 359999, 11520, 0x88845eba
-0, 374999, 11520, 0x22758af0
-0, 389998, 11520, 0x5c3e6819
-0, 404998, 11520, 0x43ac6de7
-0, 419998, 11520, 0x43ac6de7
+#tb 0: 83333/500000
+0,          0,          0,        1,    11520, 0xaf416a66
+0,          1,          1,        1,    11520, 0x8ab76654
+0,          2,          2,        1,    11520, 0xd22880c4
+0,          3,          3,        1,    11520, 0x9d2f612a
+0,          4,          4,        1,    11520, 0xf538600a
+0,          5,          5,        1,    11520, 0x371d64e6
+0,          6,          6,        1,    11520, 0x49043fbf
+0,          7,          7,        1,    11520, 0x49043fbf
+0,          8,          8,        1,    11520, 0x12d16528
+0,          9,          9,        1,    11520, 0x1e0a6109
+0,         10,         10,        1,    11520, 0x9d2f612a
+0,         11,         11,        1,    11520, 0x96e083ca
+0,         12,         12,        1,    11520, 0x8ab76654
+0,         13,         13,        1,    11520, 0x43ac6de7
+0,         14,         14,        1,    11520, 0x43ac6de7
+0,         15,         15,        1,    11520, 0x5c3e6819
+0,         16,         16,        1,    11520, 0x22758af0
+0,         17,         17,        1,    11520, 0x88845eba
+0,         18,         18,        1,    11520, 0x4b38848a
+0,         19,         19,        1,    11520, 0x4f7495d3
+0,         20,         20,        1,    11520, 0x736b702c
+0,         21,         21,        1,    11520, 0x736b702c
+0,         22,         22,        1,    11520, 0x4f7495d3
+0,         23,         23,        1,    11520, 0x4b38848a
+0,         24,         24,        1,    11520, 0x88845eba
+0,         25,         25,        1,    11520, 0x22758af0
+0,         26,         26,        1,    11520, 0x5c3e6819
+0,         27,         27,        1,    11520, 0x43ac6de7
+0,         28,         28,        1,    11520, 0x43ac6de7