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, 151 insertions, 150 deletions

diff --git a/tests/ref/fate/svq1 b/tests/ref/fate/svq1
index b048681944..3bcf715a61 100644
--- a/tests/ref/fate/svq1
+++ b/tests/ref/fate/svq1
@@ -1,150 +1,151 @@
-0, 0, 21600, 0x7f9389e3
-0, 6000, 21600, 0xcebb8896
-0, 12000, 21600, 0xef51860a
-0, 18000, 21600, 0x88d97e7d
-0, 24000, 21600, 0xc7757c88
-0, 30000, 21600, 0x2f537ade
-0, 36000, 21600, 0xd50a7eff
-0, 42000, 21600, 0xdcfb7fc6
-0, 48000, 21600, 0x0d608299
-0, 54000, 21600, 0x97ca81b4
-0, 60000, 21600, 0x791f80e7
-0, 66000, 21600, 0x96ae7d33
-0, 72000, 21600, 0x4d7474a8
-0, 78000, 21600, 0x2ae76f37
-0, 84000, 21600, 0x7da76265
-0, 90000, 21600, 0x93ae3eb6
-0, 96000, 21600, 0xebfd3868
-0, 102000, 21600, 0x54f82ffa
-0, 108000, 21600, 0x8d5b2ad0
-0, 114000, 21600, 0xe67128e6
-0, 120000, 21600, 0xb7bf613e
-0, 126000, 21600, 0xefd0f51b
-0, 132000, 21600, 0x31b7da59
-0, 138000, 21600, 0x7a84a8f7
-0, 144000, 21600, 0x0351ad27
-0, 150000, 21600, 0xed6f434d
-0, 156000, 21600, 0x0e771127
-0, 162000, 21600, 0x37bf0b95
-0, 168000, 21600, 0x30e10a77
-0, 174000, 21600, 0x1a48288a
-0, 180000, 21600, 0xf43c6770
-0, 186000, 21600, 0x3c43ae68
-0, 192000, 21600, 0x04dc0949
-0, 198000, 21600, 0x7920758d
-0, 204000, 21600, 0x6c12bab5
-0, 210000, 21600, 0x1ac23706
-0, 216000, 21600, 0x7a95cb5f
-0, 222000, 21600, 0xf1bfbb46
-0, 228000, 21600, 0x773d1d0c
-0, 234000, 21600, 0x2e7bea65
-0, 240000, 21600, 0xdb1a086f
-0, 246000, 21600, 0x5b36b78d
-0, 252000, 21600, 0x7b533ca6
-0, 258000, 21600, 0x65d75105
-0, 264000, 21600, 0xfe6f6207
-0, 270000, 21600, 0x44c4ce57
-0, 276000, 21600, 0x220f3dae
-0, 282000, 21600, 0xb4d20ffb
-0, 288000, 21600, 0x8907ad72
-0, 294000, 21600, 0xc6418998
-0, 300000, 21600, 0x395b6670
-0, 306000, 21600, 0x83495b88
-0, 312000, 21600, 0x8920d683
-0, 318000, 21600, 0xd7fc64ea
-0, 324000, 21600, 0x21a3b222
-0, 330000, 21600, 0xc11f2dbd
-0, 336000, 21600, 0xd1d5495d
-0, 342000, 21600, 0x70f2de20
-0, 348000, 21600, 0x10adc9a9
-0, 354000, 21600, 0xf713c0ec
-0, 360000, 21600, 0xa346b3fe
-0, 366000, 21600, 0x7945c29b
-0, 372000, 21600, 0xb07ceb91
-0, 378000, 21600, 0xe1eaf9ef
-0, 384000, 21600, 0x6fa915c7
-0, 390000, 21600, 0x61952055
-0, 396000, 21600, 0x4bca2382
-0, 402000, 21600, 0x36161fe2
-0, 408000, 21600, 0xf93a28f7
-0, 414000, 21600, 0xa02a3d47
-0, 420000, 21600, 0x925b3609
-0, 426000, 21600, 0x5b6941db
-0, 432000, 21600, 0x33154a91
-0, 438000, 21600, 0xb1d75c50
-0, 444000, 21600, 0x1cb369bd
-0, 450000, 21600, 0x3be4eff2
-0, 456000, 21600, 0xbb89c301
-0, 462000, 21600, 0xc7630d85
-0, 468000, 21600, 0xf7441c67
-0, 474000, 21600, 0xc23611ef
-0, 480000, 21600, 0x840efb21
-0, 486000, 21600, 0x7d470a0f
-0, 492000, 21600, 0xfe093210
-0, 498000, 21600, 0x0f3ea098
-0, 504000, 21600, 0xcd72286f
-0, 510000, 21600, 0x826f8030
-0, 516000, 21600, 0xcda3ace8
-0, 522000, 21600, 0x39cb4cd0
-0, 528000, 21600, 0xa86a60ac
-0, 534000, 21600, 0xcd32ed8e
-0, 540000, 21600, 0x769b285d
-0, 546000, 21600, 0x10234cd0
-0, 552000, 21600, 0x951036b8
-0, 558000, 21600, 0xaef248fa
-0, 564000, 21600, 0x74e36e84
-0, 570000, 21600, 0x3908531b
-0, 576000, 21600, 0x342f2a9d
-0, 582000, 21600, 0x291d58f3
-0, 588000, 21600, 0xcf24b1e5
-0, 594000, 21600, 0x3e7c7959
-0, 600000, 21600, 0x6517e573
-0, 606000, 21600, 0x304cc6db
-0, 612000, 21600, 0x272895e4
-0, 618000, 21600, 0x52325837
-0, 624000, 21600, 0xd01344bd
-0, 630000, 21600, 0xd25a370b
-0, 636000, 21600, 0x274e0ae9
-0, 642000, 21600, 0x6f66138f
-0, 648000, 21600, 0xd35a0f60
-0, 654000, 21600, 0xe0610863
-0, 660000, 21600, 0x920b05fb
-0, 666000, 21600, 0x5befe39d
-0, 672000, 21600, 0xd167bd58
-0, 678000, 21600, 0x653ac504
-0, 684000, 21600, 0x8372c6d7
-0, 690000, 21600, 0x0302c276
-0, 696000, 21600, 0xa176b694
-0, 702000, 21600, 0x4c2e935a
-0, 708000, 21600, 0xf7ea844e
-0, 714000, 21600, 0x76d6c07b
-0, 720000, 21600, 0x0a14d610
-0, 726000, 21600, 0x0ec9f3f3
-0, 732000, 21600, 0xdc90f6ea
-0, 738000, 21600, 0xc841f9ef
-0, 744000, 21600, 0x7ab5f9b9
-0, 750000, 21600, 0xda40f3c2
-0, 756000, 21600, 0x0040fb72
-0, 762000, 21600, 0x705b0786
-0, 768000, 21600, 0x26d5198d
-0, 774000, 21600, 0x6f5153ad
-0, 780000, 21600, 0x9f26624b
-0, 786000, 21600, 0x0d3ea7af
-0, 792000, 21600, 0xb957ca79
-0, 798000, 21600, 0x03a60612
-0, 804000, 21600, 0x3ddc4ff1
-0, 810000, 21600, 0x8fe5697f
-0, 816000, 21600, 0x3d199b09
-0, 822000, 21600, 0x97e2b504
-0, 828000, 21600, 0x7563f784
-0, 834000, 21600, 0x9a473879
-0, 840000, 21600, 0x2e2054e5
-0, 846000, 21600, 0x06b3658b
-0, 852000, 21600, 0xa37ee249
-0, 858000, 21600, 0xa527efa1
-0, 864000, 21600, 0x12791532
-0, 870000, 21600, 0xc5350145
-0, 876000, 21600, 0xcd44f1ac
-0, 882000, 21600, 0xe610edfb
-0, 888000, 21600, 0x5642f672
-0, 894000, 21600, 0xf2bc3e5b
+#tb 0: 1/15
+0,          0,          0,        1,    21600, 0x7f9389e3
+0,          1,          1,        1,    21600, 0xcebb8896
+0,          2,          2,        1,    21600, 0xef51860a
+0,          3,          3,        1,    21600, 0x88d97e7d
+0,          4,          4,        1,    21600, 0xc7757c88
+0,          5,          5,        1,    21600, 0x2f537ade
+0,          6,          6,        1,    21600, 0xd50a7eff
+0,          7,          7,        1,    21600, 0xdcfb7fc6
+0,          8,          8,        1,    21600, 0x0d608299
+0,          9,          9,        1,    21600, 0x97ca81b4
+0,         10,         10,        1,    21600, 0x791f80e7
+0,         11,         11,        1,    21600, 0x96ae7d33
+0,         12,         12,        1,    21600, 0x4d7474a8
+0,         13,         13,        1,    21600, 0x2ae76f37
+0,         14,         14,        1,    21600, 0x7da76265
+0,         15,         15,        1,    21600, 0x93ae3eb6
+0,         16,         16,        1,    21600, 0xebfd3868
+0,         17,         17,        1,    21600, 0x54f82ffa
+0,         18,         18,        1,    21600, 0x8d5b2ad0
+0,         19,         19,        1,    21600, 0xe67128e6
+0,         20,         20,        1,    21600, 0xb7bf613e
+0,         21,         21,        1,    21600, 0xefd0f51b
+0,         22,         22,        1,    21600, 0x31b7da59
+0,         23,         23,        1,    21600, 0x7a84a8f7
+0,         24,         24,        1,    21600, 0x0351ad27
+0,         25,         25,        1,    21600, 0xed6f434d
+0,         26,         26,        1,    21600, 0x0e771127
+0,         27,         27,        1,    21600, 0x37bf0b95
+0,         28,         28,        1,    21600, 0x30e10a77
+0,         29,         29,        1,    21600, 0x1a48288a
+0,         30,         30,        1,    21600, 0xf43c6770
+0,         31,         31,        1,    21600, 0x3c43ae68
+0,         32,         32,        1,    21600, 0x04dc0949
+0,         33,         33,        1,    21600, 0x7920758d
+0,         34,         34,        1,    21600, 0x6c12bab5
+0,         35,         35,        1,    21600, 0x1ac23706
+0,         36,         36,        1,    21600, 0x7a95cb5f
+0,         37,         37,        1,    21600, 0xf1bfbb46
+0,         38,         38,        1,    21600, 0x773d1d0c
+0,         39,         39,        1,    21600, 0x2e7bea65
+0,         40,         40,        1,    21600, 0xdb1a086f
+0,         41,         41,        1,    21600, 0x5b36b78d
+0,         42,         42,        1,    21600, 0x7b533ca6
+0,         43,         43,        1,    21600, 0x65d75105
+0,         44,         44,        1,    21600, 0xfe6f6207
+0,         45,         45,        1,    21600, 0x44c4ce57
+0,         46,         46,        1,    21600, 0x220f3dae
+0,         47,         47,        1,    21600, 0xb4d20ffb
+0,         48,         48,        1,    21600, 0x8907ad72
+0,         49,         49,        1,    21600, 0xc6418998
+0,         50,         50,        1,    21600, 0x395b6670
+0,         51,         51,        1,    21600, 0x83495b88
+0,         52,         52,        1,    21600, 0x8920d683
+0,         53,         53,        1,    21600, 0xd7fc64ea
+0,         54,         54,        1,    21600, 0x21a3b222
+0,         55,         55,        1,    21600, 0xc11f2dbd
+0,         56,         56,        1,    21600, 0xd1d5495d
+0,         57,         57,        1,    21600, 0x70f2de20
+0,         58,         58,        1,    21600, 0x10adc9a9
+0,         59,         59,        1,    21600, 0xf713c0ec
+0,         60,         60,        1,    21600, 0xa346b3fe
+0,         61,         61,        1,    21600, 0x7945c29b
+0,         62,         62,        1,    21600, 0xb07ceb91
+0,         63,         63,        1,    21600, 0xe1eaf9ef
+0,         64,         64,        1,    21600, 0x6fa915c7
+0,         65,         65,        1,    21600, 0x61952055
+0,         66,         66,        1,    21600, 0x4bca2382
+0,         67,         67,        1,    21600, 0x36161fe2
+0,         68,         68,        1,    21600, 0xf93a28f7
+0,         69,         69,        1,    21600, 0xa02a3d47
+0,         70,         70,        1,    21600, 0x925b3609
+0,         71,         71,        1,    21600, 0x5b6941db
+0,         72,         72,        1,    21600, 0x33154a91
+0,         73,         73,        1,    21600, 0xb1d75c50
+0,         74,         74,        1,    21600, 0x1cb369bd
+0,         75,         75,        1,    21600, 0x3be4eff2
+0,         76,         76,        1,    21600, 0xbb89c301
+0,         77,         77,        1,    21600, 0xc7630d85
+0,         78,         78,        1,    21600, 0xf7441c67
+0,         79,         79,        1,    21600, 0xc23611ef
+0,         80,         80,        1,    21600, 0x840efb21
+0,         81,         81,        1,    21600, 0x7d470a0f
+0,         82,         82,        1,    21600, 0xfe093210
+0,         83,         83,        1,    21600, 0x0f3ea098
+0,         84,         84,        1,    21600, 0xcd72286f
+0,         85,         85,        1,    21600, 0x826f8030
+0,         86,         86,        1,    21600, 0xcda3ace8
+0,         87,         87,        1,    21600, 0x39cb4cd0
+0,         88,         88,        1,    21600, 0xa86a60ac
+0,         89,         89,        1,    21600, 0xcd32ed8e
+0,         90,         90,        1,    21600, 0x769b285d
+0,         91,         91,        1,    21600, 0x10234cd0
+0,         92,         92,        1,    21600, 0x951036b8
+0,         93,         93,        1,    21600, 0xaef248fa
+0,         94,         94,        1,    21600, 0x74e36e84
+0,         95,         95,        1,    21600, 0x3908531b
+0,         96,         96,        1,    21600, 0x342f2a9d
+0,         97,         97,        1,    21600, 0x291d58f3
+0,         98,         98,        1,    21600, 0xcf24b1e5
+0,         99,         99,        1,    21600, 0x3e7c7959
+0,        100,        100,        1,    21600, 0x6517e573
+0,        101,        101,        1,    21600, 0x304cc6db
+0,        102,        102,        1,    21600, 0x272895e4
+0,        103,        103,        1,    21600, 0x52325837
+0,        104,        104,        1,    21600, 0xd01344bd
+0,        105,        105,        1,    21600, 0xd25a370b
+0,        106,        106,        1,    21600, 0x274e0ae9
+0,        107,        107,        1,    21600, 0x6f66138f
+0,        108,        108,        1,    21600, 0xd35a0f60
+0,        109,        109,        1,    21600, 0xe0610863
+0,        110,        110,        1,    21600, 0x920b05fb
+0,        111,        111,        1,    21600, 0x5befe39d
+0,        112,        112,        1,    21600, 0xd167bd58
+0,        113,        113,        1,    21600, 0x653ac504
+0,        114,        114,        1,    21600, 0x8372c6d7
+0,        115,        115,        1,    21600, 0x0302c276
+0,        116,        116,        1,    21600, 0xa176b694
+0,        117,        117,        1,    21600, 0x4c2e935a
+0,        118,        118,        1,    21600, 0xf7ea844e
+0,        119,        119,        1,    21600, 0x76d6c07b
+0,        120,        120,        1,    21600, 0x0a14d610
+0,        121,        121,        1,    21600, 0x0ec9f3f3
+0,        122,        122,        1,    21600, 0xdc90f6ea
+0,        123,        123,        1,    21600, 0xc841f9ef
+0,        124,        124,        1,    21600, 0x7ab5f9b9
+0,        125,        125,        1,    21600, 0xda40f3c2
+0,        126,        126,        1,    21600, 0x0040fb72
+0,        127,        127,        1,    21600, 0x705b0786
+0,        128,        128,        1,    21600, 0x26d5198d
+0,        129,        129,        1,    21600, 0x6f5153ad
+0,        130,        130,        1,    21600, 0x9f26624b
+0,        131,        131,        1,    21600, 0x0d3ea7af
+0,        132,        132,        1,    21600, 0xb957ca79
+0,        133,        133,        1,    21600, 0x03a60612
+0,        134,        134,        1,    21600, 0x3ddc4ff1
+0,        135,        135,        1,    21600, 0x8fe5697f
+0,        136,        136,        1,    21600, 0x3d199b09
+0,        137,        137,        1,    21600, 0x97e2b504
+0,        138,        138,        1,    21600, 0x7563f784
+0,        139,        139,        1,    21600, 0x9a473879
+0,        140,        140,        1,    21600, 0x2e2054e5
+0,        141,        141,        1,    21600, 0x06b3658b
+0,        142,        142,        1,    21600, 0xa37ee249
+0,        143,        143,        1,    21600, 0xa527efa1
+0,        144,        144,        1,    21600, 0x12791532
+0,        145,        145,        1,    21600, 0xc5350145
+0,        146,        146,        1,    21600, 0xcd44f1ac
+0,        147,        147,        1,    21600, 0xe610edfb
+0,        148,        148,        1,    21600, 0x5642f672
+0,        149,        149,        1,    21600, 0xf2bc3e5b