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, 110 insertions, 109 deletions

diff --git a/tests/ref/fate/rv30 b/tests/ref/fate/rv30
index a3c5dcfbbf..df002d948b 100644
--- a/tests/ref/fate/rv30
+++ b/tests/ref/fate/rv30
@@ -1,109 +1,110 @@
-0, 0, 126720, 0xcefaec47
-0, 3003, 126720, 0xa416ece5
-0, 6006, 126720, 0xa416ece5
-0, 9009, 126720, 0xa416ece5
-0, 12012, 126720, 0x60d6ed27
-0, 15015, 126720, 0x259af497
-0, 18018, 126720, 0x5e6ff4d7
-0, 21021, 126720, 0xcc10f4b7
-0, 24024, 126720, 0x763ab817
-0, 27027, 126720, 0xeb6fb8d7
-0, 30030, 126720, 0xda71b917
-0, 33033, 126720, 0x0967b8f7
-0, 36036, 126720, 0x4b62b947
-0, 39039, 126720, 0xbb1abbb7
-0, 42042, 126720, 0x273fbc37
-0, 45045, 126720, 0x16eebbd7
-0, 48048, 126720, 0x105eb927
-0, 51051, 126720, 0x7fa3ae27
-0, 54054, 126720, 0x722e99f7
-0, 57057, 126720, 0x5ac9a827
-0, 60060, 126720, 0x07beba77
-0, 63063, 126720, 0x29d6a887
-0, 66066, 126720, 0xa5caab87
-0, 69069, 126720, 0x9ca7aac7
-0, 72072, 126720, 0xb7debcd7
-0, 75075, 126720, 0xd115a757
-0, 78078, 126720, 0x6ddaef32
-0, 81081, 126720, 0xde1bb900
-0, 84084, 126720, 0xac6c071b
-0, 87087, 126720, 0x04e7897c
-0, 90090, 126720, 0x5eee050f
-0, 93093, 126720, 0xe675be59
-0, 96096, 126720, 0xdc3e0837
-0, 99099, 126720, 0x68cfda2b
-0, 102102, 126720, 0xe572dfc9
-0, 105105, 126720, 0x582fb176
-0, 108108, 126720, 0xa9477df0
-0, 111111, 126720, 0xbc3cc34f
-0, 114114, 126720, 0xcf8cb0e2
-0, 117117, 126720, 0xcff1db35
-0, 120120, 126720, 0xc6e10f9f
-0, 123123, 126720, 0x75ae61b6
-0, 126126, 126720, 0x12af3119
-0, 129129, 126720, 0x85597543
-0, 132132, 126720, 0x68c27aca
-0, 135135, 126720, 0x554fe3e4
-0, 138138, 126720, 0x72ecea95
-0, 141141, 126720, 0xf4d003d1
-0, 144144, 126720, 0x9bf6a605
-0, 147147, 126720, 0x5d00b5fe
-0, 150150, 126720, 0x93f7b040
-0, 153153, 126720, 0x0d6ad154
-0, 156156, 126720, 0x4be8b4ea
-0, 159159, 126720, 0xe39bba0d
-0, 162162, 126720, 0x9c21bad8
-0, 165165, 126720, 0xa567f25b
-0, 168168, 126720, 0x7a82663a
-0, 171171, 126720, 0x72f2a47d
-0, 174174, 126720, 0x4f639ebe
-0, 177177, 126720, 0xab0fce83
-0, 180180, 126720, 0x6cf87d39
-0, 183183, 126720, 0x534a10cc
-0, 186186, 126720, 0x6bbcf44c
-0, 189189, 126720, 0xfdca11d3
-0, 192192, 126720, 0x7e58f5a6
-0, 195195, 126720, 0x5fd753d8
-0, 198198, 126720, 0x0c735615
-0, 201201, 126720, 0x2a034ebf
-0, 204204, 126720, 0xeaf3dd0b
-0, 207207, 126720, 0x0eaf0c1b
-0, 210210, 126720, 0xce5e6794
-0, 213213, 126720, 0xf27c31c3
-0, 216216, 126720, 0xb64af168
-0, 219219, 126720, 0x14cf7974
-0, 222222, 126720, 0x1c2a513d
-0, 225225, 126720, 0xa3f515ab
-0, 228228, 126720, 0xcfd62765
-0, 231231, 126720, 0xbc513f2a
-0, 234234, 126720, 0xbc303fae
-0, 237237, 126720, 0x2f8f69b9
-0, 240240, 126720, 0x0a22cc69
-0, 243243, 126720, 0xd9f67585
-0, 246246, 126720, 0x20403001
-0, 249249, 126720, 0xf92b2a25
-0, 252252, 126720, 0x3c170aad
-0, 255255, 126720, 0x3378251f
-0, 258258, 126720, 0xb3ed5911
-0, 261261, 126720, 0x35d24ef8
-0, 264264, 126720, 0x8da30275
-0, 267267, 126720, 0xc15a3577
-0, 270270, 126720, 0xf2942f53
-0, 273273, 126720, 0x44d8304a
-0, 276276, 126720, 0xd688a932
-0, 279279, 126720, 0x0a24f256
-0, 282282, 126720, 0xfab9c45d
-0, 285285, 126720, 0x10e939ce
-0, 288288, 126720, 0x97fcaa3a
-0, 291291, 126720, 0x45464610
-0, 294294, 126720, 0xfe2e057d
-0, 297297, 126720, 0x0b6718ae
-0, 300300, 126720, 0x5284da7b
-0, 303303, 126720, 0x23efdc35
-0, 306306, 126720, 0xc387b2b3
-0, 309309, 126720, 0xc9e92bf1
-0, 312312, 126720, 0xfbf20a01
-0, 315315, 126720, 0x4d888b2e
-0, 318318, 126720, 0xdd0d74df
-0, 321321, 126720, 0x49d07aa4
-0, 324324, 126720, 0x08382b8e
+#tb 0: 32768/982057
+0,          0,          0,        1,   126720, 0xcefaec47
+0,          1,          1,        1,   126720, 0xa416ece5
+0,          2,          2,        1,   126720, 0xa416ece5
+0,          3,          3,        1,   126720, 0xa416ece5
+0,          4,          4,        1,   126720, 0x60d6ed27
+0,          5,          5,        1,   126720, 0x259af497
+0,          6,          6,        1,   126720, 0x5e6ff4d7
+0,          7,          7,        1,   126720, 0xcc10f4b7
+0,          8,          8,        1,   126720, 0x763ab817
+0,          9,          9,        1,   126720, 0xeb6fb8d7
+0,         10,         10,        1,   126720, 0xda71b917
+0,         11,         11,        1,   126720, 0x0967b8f7
+0,         12,         12,        1,   126720, 0x4b62b947
+0,         13,         13,        1,   126720, 0xbb1abbb7
+0,         14,         14,        1,   126720, 0x273fbc37
+0,         15,         15,        1,   126720, 0x16eebbd7
+0,         16,         16,        1,   126720, 0x105eb927
+0,         17,         17,        1,   126720, 0x7fa3ae27
+0,         18,         18,        1,   126720, 0x722e99f7
+0,         19,         19,        1,   126720, 0x5ac9a827
+0,         20,         20,        1,   126720, 0x07beba77
+0,         21,         21,        1,   126720, 0x29d6a887
+0,         22,         22,        1,   126720, 0xa5caab87
+0,         23,         23,        1,   126720, 0x9ca7aac7
+0,         24,         24,        1,   126720, 0xb7debcd7
+0,         25,         25,        1,   126720, 0xd115a757
+0,         26,         26,        1,   126720, 0x6ddaef32
+0,         27,         27,        1,   126720, 0xde1bb900
+0,         28,         28,        1,   126720, 0xac6c071b
+0,         29,         29,        1,   126720, 0x04e7897c
+0,         30,         30,        1,   126720, 0x5eee050f
+0,         31,         31,        1,   126720, 0xe675be59
+0,         32,         32,        1,   126720, 0xdc3e0837
+0,         33,         33,        1,   126720, 0x68cfda2b
+0,         34,         34,        1,   126720, 0xe572dfc9
+0,         35,         35,        1,   126720, 0x582fb176
+0,         36,         36,        1,   126720, 0xa9477df0
+0,         37,         37,        1,   126720, 0xbc3cc34f
+0,         38,         38,        1,   126720, 0xcf8cb0e2
+0,         39,         39,        1,   126720, 0xcff1db35
+0,         40,         40,        1,   126720, 0xc6e10f9f
+0,         41,         41,        1,   126720, 0x75ae61b6
+0,         42,         42,        1,   126720, 0x12af3119
+0,         43,         43,        1,   126720, 0x85597543
+0,         44,         44,        1,   126720, 0x68c27aca
+0,         45,         45,        1,   126720, 0x554fe3e4
+0,         46,         46,        1,   126720, 0x72ecea95
+0,         47,         47,        1,   126720, 0xf4d003d1
+0,         48,         48,        1,   126720, 0x9bf6a605
+0,         49,         49,        1,   126720, 0x5d00b5fe
+0,         50,         50,        1,   126720, 0x93f7b040
+0,         51,         51,        1,   126720, 0x0d6ad154
+0,         52,         52,        1,   126720, 0x4be8b4ea
+0,         53,         53,        1,   126720, 0xe39bba0d
+0,         54,         54,        1,   126720, 0x9c21bad8
+0,         55,         55,        1,   126720, 0xa567f25b
+0,         56,         56,        1,   126720, 0x7a82663a
+0,         57,         57,        1,   126720, 0x72f2a47d
+0,         58,         58,        1,   126720, 0x4f639ebe
+0,         59,         59,        1,   126720, 0xab0fce83
+0,         60,         60,        1,   126720, 0x6cf87d39
+0,         61,         61,        1,   126720, 0x534a10cc
+0,         62,         62,        1,   126720, 0x6bbcf44c
+0,         63,         63,        1,   126720, 0xfdca11d3
+0,         64,         64,        1,   126720, 0x7e58f5a6
+0,         65,         65,        1,   126720, 0x5fd753d8
+0,         66,         66,        1,   126720, 0x0c735615
+0,         67,         67,        1,   126720, 0x2a034ebf
+0,         68,         68,        1,   126720, 0xeaf3dd0b
+0,         69,         69,        1,   126720, 0x0eaf0c1b
+0,         70,         70,        1,   126720, 0xce5e6794
+0,         71,         71,        1,   126720, 0xf27c31c3
+0,         72,         72,        1,   126720, 0xb64af168
+0,         73,         73,        1,   126720, 0x14cf7974
+0,         74,         74,        1,   126720, 0x1c2a513d
+0,         75,         75,        1,   126720, 0xa3f515ab
+0,         76,         76,        1,   126720, 0xcfd62765
+0,         77,         77,        1,   126720, 0xbc513f2a
+0,         78,         78,        1,   126720, 0xbc303fae
+0,         79,         79,        1,   126720, 0x2f8f69b9
+0,         80,         80,        1,   126720, 0x0a22cc69
+0,         81,         81,        1,   126720, 0xd9f67585
+0,         82,         82,        1,   126720, 0x20403001
+0,         83,         83,        1,   126720, 0xf92b2a25
+0,         84,         84,        1,   126720, 0x3c170aad
+0,         85,         85,        1,   126720, 0x3378251f
+0,         86,         86,        1,   126720, 0xb3ed5911
+0,         87,         87,        1,   126720, 0x35d24ef8
+0,         88,         88,        1,   126720, 0x8da30275
+0,         89,         89,        1,   126720, 0xc15a3577
+0,         90,         90,        1,   126720, 0xf2942f53
+0,         91,         91,        1,   126720, 0x44d8304a
+0,         92,         92,        1,   126720, 0xd688a932
+0,         93,         93,        1,   126720, 0x0a24f256
+0,         94,         94,        1,   126720, 0xfab9c45d
+0,         95,         95,        1,   126720, 0x10e939ce
+0,         96,         96,        1,   126720, 0x97fcaa3a
+0,         97,         97,        1,   126720, 0x45464610
+0,         98,         98,        1,   126720, 0xfe2e057d
+0,         99,         99,        1,   126720, 0x0b6718ae
+0,        100,        100,        1,   126720, 0x5284da7b
+0,        101,        101,        1,   126720, 0x23efdc35
+0,        102,        102,        1,   126720, 0xc387b2b3
+0,        103,        103,        1,   126720, 0xc9e92bf1
+0,        104,        104,        1,   126720, 0xfbf20a01
+0,        105,        105,        1,   126720, 0x4d888b2e
+0,        106,        106,        1,   126720, 0xdd0d74df
+0,        107,        107,        1,   126720, 0x49d07aa4
+0,        108,        108,        1,   126720, 0x08382b8e