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, 58 insertions, 57 deletions

diff --git a/tests/ref/fate/vp8-test-vector-010 b/tests/ref/fate/vp8-test-vector-010
index ea5c8f396c..b250ad92d1 100644
--- a/tests/ref/fate/vp8-test-vector-010
+++ b/tests/ref/fate/vp8-test-vector-010
@@ -1,57 +1,58 @@
-0, 0, 115200, 3441ec1a9b9d325c9aeda44e3b68377d
-0, 3000, 115200, bff86a84fd673394f45c09d19a1ee0ac
-0, 6000, 115200, 8cd920f0de408e8cd883f9241680ff80
-0, 9000, 115200, d1b27cbb40859bbbb6da40dce6ddbf1b
-0, 12000, 115200, ca102ed86e45fe452f55a2cf0253de21
-0, 15000, 115200, ac7630be64017becd6e958df360263b5
-0, 18000, 115200, a044041ede746687d33ba6342d8d3edb
-0, 21000, 115200, 75d7c0eec357afd0c2d54e769f551b20
-0, 24000, 115200, eebd916e4fba53a66fc8e6ab98091a0f
-0, 27000, 115200, c0044160a944dcac81efe9f63def4bc2
-0, 30000, 115200, 9ba8b2ccbea045b39bd150ea383abc00
-0, 33000, 115200, 8d7654804fc62f7d52d5bf3d47f536e9
-0, 36000, 115200, 9fd6cd81fbe6cfc43e03cdf166c7ea93
-0, 39000, 115200, a1a494064dba27238005227c0808c5f6
-0, 42000, 115200, b8dca72164ea72b3f257c97c3ad87416
-0, 45000, 115200, 90ae005c0f3ddb4318318805b8fc29cf
-0, 48000, 115200, 8183e7b60f18887a9530a7905db4b417
-0, 51000, 115200, 1650ad1fff9076141f59b660c562f0f2
-0, 54000, 115200, e9ee675cafd270c366ac9d3ced5af879
-0, 57000, 115200, 2257172d6e8628b4dd4d9bf97e9ee2c3
-0, 60000, 115200, 577438f88feca7a876381a6fcf094684
-0, 63000, 115200, 4b37e90eb35cba66d31616169020c039
-0, 66000, 115200, 2c631ab87b8d3b7df13f888e3d6f1690
-0, 69000, 115200, e0d46e04d6a57b20c2b056cd0a0ca1ec
-0, 72000, 115200, 65bd3e207b8ed966b71f40a04f1900b8
-0, 75000, 115200, fd842606a20fb297463b7b3dd6efa2c2
-0, 78000, 115200, 778cd96eabe785320254db7692583f47
-0, 81000, 115200, 094272ad385a64fbc70a62f958e27eff
-0, 84000, 115200, cf5f7b3b94a00938b633ea1d9aa8e8dc
-0, 87000, 115200, 032e2f3649484ca17c739cf89052de77
-0, 90000, 115200, 9afe92189c21675745609e3b21a75941
-0, 93000, 115200, a5e087c496798bfbc64d6c26eee0b3af
-0, 96000, 115200, efb2716347ba2e01f7dc103d2a6cebb4
-0, 99000, 115200, c83541678dcca8937e372102bc4d1f68
-0, 102000, 115200, 3401ed97a9296610c8473dcf03e13f20
-0, 105000, 115200, 35af1327fafe026b6539951a9baee282
-0, 108000, 115200, f320e2d64192849c08c4c5e6d79e4ecf
-0, 111000, 115200, 5a661af83f451d8651cf081399d451b2
-0, 114000, 115200, 625d271b60d91229699f1de35d232b13
-0, 117000, 115200, 8e504154fa8eba5f9807bf40c647eea8
-0, 120000, 115200, 094ecb39a65c71e85d15a587472bb336
-0, 123000, 115200, 4d08bfe5771f00e13646be49e3471c4c
-0, 126000, 115200, 20841206e07721fb631088d492622543
-0, 129000, 115200, edf969142e1b053f951c1a5756f2b5d9
-0, 132000, 115200, 4959a13f20311d9b435e501fd753c94b
-0, 135000, 115200, a7f34e6c985d630af07a9f6dc47ea50e
-0, 138000, 115200, 96f6667d849f3abe4e85e3ce368b76ee
-0, 141000, 115200, a47d443c8aa5f2d2e3b44deab3f4f8e7
-0, 144000, 115200, 4ebda78d96facc4472ecdb4f667be0c6
-0, 147000, 115200, 6ba744c47edab85c6e77584e35e1b735
-0, 150000, 115200, 4d2e6882f15356171e4383111ec70e6e
-0, 153000, 115200, 85077fc81dff947b1251bfbd981aaf52
-0, 156000, 115200, f03e8879a5218387c502eaab31682df9
-0, 159000, 115200, 90f6128298cb52f769d697f9f842df27
-0, 162000, 115200, 700a705680c1a940141bc03ae5de391b
-0, 165000, 115200, 049b3df3ed9673ab8e0f0d0d896f65c2
-0, 168000, 115200, ca8c3e5509211dc92078371f06dc8635
+#tb 0: 1/30
+0,          0,          0,        1,   115200, 3441ec1a9b9d325c9aeda44e3b68377d
+0,          1,          1,        1,   115200, bff86a84fd673394f45c09d19a1ee0ac
+0,          2,          2,        1,   115200, 8cd920f0de408e8cd883f9241680ff80
+0,          3,          3,        1,   115200, d1b27cbb40859bbbb6da40dce6ddbf1b
+0,          4,          4,        1,   115200, ca102ed86e45fe452f55a2cf0253de21
+0,          5,          5,        1,   115200, ac7630be64017becd6e958df360263b5
+0,          6,          6,        1,   115200, a044041ede746687d33ba6342d8d3edb
+0,          7,          7,        1,   115200, 75d7c0eec357afd0c2d54e769f551b20
+0,          8,          8,        1,   115200, eebd916e4fba53a66fc8e6ab98091a0f
+0,          9,          9,        1,   115200, c0044160a944dcac81efe9f63def4bc2
+0,         10,         10,        1,   115200, 9ba8b2ccbea045b39bd150ea383abc00
+0,         11,         11,        1,   115200, 8d7654804fc62f7d52d5bf3d47f536e9
+0,         12,         12,        1,   115200, 9fd6cd81fbe6cfc43e03cdf166c7ea93
+0,         13,         13,        1,   115200, a1a494064dba27238005227c0808c5f6
+0,         14,         14,        1,   115200, b8dca72164ea72b3f257c97c3ad87416
+0,         15,         15,        1,   115200, 90ae005c0f3ddb4318318805b8fc29cf
+0,         16,         16,        1,   115200, 8183e7b60f18887a9530a7905db4b417
+0,         17,         17,        1,   115200, 1650ad1fff9076141f59b660c562f0f2
+0,         18,         18,        1,   115200, e9ee675cafd270c366ac9d3ced5af879
+0,         19,         19,        1,   115200, 2257172d6e8628b4dd4d9bf97e9ee2c3
+0,         20,         20,        1,   115200, 577438f88feca7a876381a6fcf094684
+0,         21,         21,        1,   115200, 4b37e90eb35cba66d31616169020c039
+0,         22,         22,        1,   115200, 2c631ab87b8d3b7df13f888e3d6f1690
+0,         23,         23,        1,   115200, e0d46e04d6a57b20c2b056cd0a0ca1ec
+0,         24,         24,        1,   115200, 65bd3e207b8ed966b71f40a04f1900b8
+0,         25,         25,        1,   115200, fd842606a20fb297463b7b3dd6efa2c2
+0,         26,         26,        1,   115200, 778cd96eabe785320254db7692583f47
+0,         27,         27,        1,   115200, 094272ad385a64fbc70a62f958e27eff
+0,         28,         28,        1,   115200, cf5f7b3b94a00938b633ea1d9aa8e8dc
+0,         29,         29,        1,   115200, 032e2f3649484ca17c739cf89052de77
+0,         30,         30,        1,   115200, 9afe92189c21675745609e3b21a75941
+0,         31,         31,        1,   115200, a5e087c496798bfbc64d6c26eee0b3af
+0,         32,         32,        1,   115200, efb2716347ba2e01f7dc103d2a6cebb4
+0,         33,         33,        1,   115200, c83541678dcca8937e372102bc4d1f68
+0,         34,         34,        1,   115200, 3401ed97a9296610c8473dcf03e13f20
+0,         35,         35,        1,   115200, 35af1327fafe026b6539951a9baee282
+0,         36,         36,        1,   115200, f320e2d64192849c08c4c5e6d79e4ecf
+0,         37,         37,        1,   115200, 5a661af83f451d8651cf081399d451b2
+0,         38,         38,        1,   115200, 625d271b60d91229699f1de35d232b13
+0,         39,         39,        1,   115200, 8e504154fa8eba5f9807bf40c647eea8
+0,         40,         40,        1,   115200, 094ecb39a65c71e85d15a587472bb336
+0,         41,         41,        1,   115200, 4d08bfe5771f00e13646be49e3471c4c
+0,         42,         42,        1,   115200, 20841206e07721fb631088d492622543
+0,         43,         43,        1,   115200, edf969142e1b053f951c1a5756f2b5d9
+0,         44,         44,        1,   115200, 4959a13f20311d9b435e501fd753c94b
+0,         45,         45,        1,   115200, a7f34e6c985d630af07a9f6dc47ea50e
+0,         46,         46,        1,   115200, 96f6667d849f3abe4e85e3ce368b76ee
+0,         47,         47,        1,   115200, a47d443c8aa5f2d2e3b44deab3f4f8e7
+0,         48,         48,        1,   115200, 4ebda78d96facc4472ecdb4f667be0c6
+0,         49,         49,        1,   115200, 6ba744c47edab85c6e77584e35e1b735
+0,         50,         50,        1,   115200, 4d2e6882f15356171e4383111ec70e6e
+0,         51,         51,        1,   115200, 85077fc81dff947b1251bfbd981aaf52
+0,         52,         52,        1,   115200, f03e8879a5218387c502eaab31682df9
+0,         53,         53,        1,   115200, 90f6128298cb52f769d697f9f842df27
+0,         54,         54,        1,   115200, 700a705680c1a940141bc03ae5de391b
+0,         55,         55,        1,   115200, 049b3df3ed9673ab8e0f0d0d896f65c2
+0,         56,         56,        1,   115200, ca8c3e5509211dc92078371f06dc8635