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, 61 insertions, 60 deletions

diff --git a/tests/ref/fate/vc1_sa20021 b/tests/ref/fate/vc1_sa20021
index 21b37e0936..22989a0aed 100644
--- a/tests/ref/fate/vc1_sa20021
+++ b/tests/ref/fate/vc1_sa20021
@@ -1,60 +1,61 @@
-0, 0, 506880, 0x884bc093
-0, 7200, 506880, 0x4b09548f
-0, 10800, 506880, 0x195cbee1
-0, 14400, 506880, 0xc8141e28
-0, 18000, 506880, 0xb170c49b
-0, 21600, 506880, 0x2782268a
-0, 25200, 506880, 0x2782268a
-0, 28800, 506880, 0x2782268a
-0, 32400, 506880, 0x2782268a
-0, 36000, 506880, 0xe6803b32
-0, 39600, 506880, 0xe6803b32
-0, 43200, 506880, 0xa5ef9baf
-0, 46800, 506880, 0xa5ef9baf
-0, 50400, 506880, 0x46e8cbcb
-0, 54000, 506880, 0x28a2239b
-0, 57600, 506880, 0x7667af2f
-0, 61200, 506880, 0x7667af2f
-0, 64800, 506880, 0x8011bcaf
-0, 68400, 506880, 0xd422115b
-0, 72000, 506880, 0xd422115b
-0, 75600, 506880, 0xd422115b
-0, 79200, 506880, 0xbcee0b5b
-0, 82800, 506880, 0x08fe9ec8
-0, 86400, 506880, 0xc8fb8b37
-0, 90000, 506880, 0xc8fb8b37
-0, 93600, 506880, 0x2c698b52
-0, 97200, 506880, 0x2c698b52
-0, 100800, 506880, 0x2c698b52
-0, 104400, 506880, 0x2b4ad9bc
-0, 108000, 506880, 0x2b4ad9bc
-0, 111600, 506880, 0x2b4ad9bc
-0, 115200, 506880, 0x2b4ad9bc
-0, 118800, 506880, 0x92e84ebb
-0, 122400, 506880, 0x92e84ebb
-0, 126000, 506880, 0xdb877da3
-0, 129600, 506880, 0xdb877da3
-0, 133200, 506880, 0xdb877da3
-0, 136800, 506880, 0x44610654
-0, 140400, 506880, 0x44610654
-0, 144000, 506880, 0xe254ce67
-0, 147600, 506880, 0xa6085385
-0, 151200, 506880, 0x2d45d744
-0, 154800, 506880, 0x2d45d744
-0, 158400, 506880, 0x6e684f51
-0, 162000, 506880, 0xe96186cf
-0, 165600, 506880, 0xb535d369
-0, 169200, 506880, 0xb535d369
-0, 172800, 506880, 0xb535d369
-0, 176400, 506880, 0xeed0b7e0
-0, 180000, 506880, 0xeed0b7e0
-0, 183600, 506880, 0xeed0b7e0
-0, 187200, 506880, 0xeed0b7e0
-0, 190800, 506880, 0x8789b20b
-0, 194400, 506880, 0x0a0f42fb
-0, 198000, 506880, 0x09bbac2d
-0, 201600, 506880, 0x09bbac2d
-0, 205200, 506880, 0x09bbac2d
-0, 208800, 506880, 0x09bbac2d
-0, 212400, 506880, 0x09bbac2d
-0, 216000, 506880, 0xda77f0df
+#tb 0: 1/25
+0,          0,          0,        1,   506880, 0x884bc093
+0,          2,          2,        1,   506880, 0x4b09548f
+0,          3,          3,        1,   506880, 0x195cbee1
+0,          4,          4,        1,   506880, 0xc8141e28
+0,          5,          5,        1,   506880, 0xb170c49b
+0,          6,          6,        1,   506880, 0x2782268a
+0,          7,          7,        1,   506880, 0x2782268a
+0,          8,          8,        1,   506880, 0x2782268a
+0,          9,          9,        1,   506880, 0x2782268a
+0,         10,         10,        1,   506880, 0xe6803b32
+0,         11,         11,        1,   506880, 0xe6803b32
+0,         12,         12,        1,   506880, 0xa5ef9baf
+0,         13,         13,        1,   506880, 0xa5ef9baf
+0,         14,         14,        1,   506880, 0x46e8cbcb
+0,         15,         15,        1,   506880, 0x28a2239b
+0,         16,         16,        1,   506880, 0x7667af2f
+0,         17,         17,        1,   506880, 0x7667af2f
+0,         18,         18,        1,   506880, 0x8011bcaf
+0,         19,         19,        1,   506880, 0xd422115b
+0,         20,         20,        1,   506880, 0xd422115b
+0,         21,         21,        1,   506880, 0xd422115b
+0,         22,         22,        1,   506880, 0xbcee0b5b
+0,         23,         23,        1,   506880, 0x08fe9ec8
+0,         24,         24,        1,   506880, 0xc8fb8b37
+0,         25,         25,        1,   506880, 0xc8fb8b37
+0,         26,         26,        1,   506880, 0x2c698b52
+0,         27,         27,        1,   506880, 0x2c698b52
+0,         28,         28,        1,   506880, 0x2c698b52
+0,         29,         29,        1,   506880, 0x2b4ad9bc
+0,         30,         30,        1,   506880, 0x2b4ad9bc
+0,         31,         31,        1,   506880, 0x2b4ad9bc
+0,         32,         32,        1,   506880, 0x2b4ad9bc
+0,         33,         33,        1,   506880, 0x92e84ebb
+0,         34,         34,        1,   506880, 0x92e84ebb
+0,         35,         35,        1,   506880, 0xdb877da3
+0,         36,         36,        1,   506880, 0xdb877da3
+0,         37,         37,        1,   506880, 0xdb877da3
+0,         38,         38,        1,   506880, 0x44610654
+0,         39,         39,        1,   506880, 0x44610654
+0,         40,         40,        1,   506880, 0xe254ce67
+0,         41,         41,        1,   506880, 0xa6085385
+0,         42,         42,        1,   506880, 0x2d45d744
+0,         43,         43,        1,   506880, 0x2d45d744
+0,         44,         44,        1,   506880, 0x6e684f51
+0,         45,         45,        1,   506880, 0xe96186cf
+0,         46,         46,        1,   506880, 0xb535d369
+0,         47,         47,        1,   506880, 0xb535d369
+0,         48,         48,        1,   506880, 0xb535d369
+0,         49,         49,        1,   506880, 0xeed0b7e0
+0,         50,         50,        1,   506880, 0xeed0b7e0
+0,         51,         51,        1,   506880, 0xeed0b7e0
+0,         52,         52,        1,   506880, 0xeed0b7e0
+0,         53,         53,        1,   506880, 0x8789b20b
+0,         54,         54,        1,   506880, 0x0a0f42fb
+0,         55,         55,        1,   506880, 0x09bbac2d
+0,         56,         56,        1,   506880, 0x09bbac2d
+0,         57,         57,        1,   506880, 0x09bbac2d
+0,         58,         58,        1,   506880, 0x09bbac2d
+0,         59,         59,        1,   506880, 0x09bbac2d
+0,         60,         60,        1,   506880, 0xda77f0df