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, 183 insertions, 181 deletions

diff --git a/tests/ref/fate/xmv-demux b/tests/ref/fate/xmv-demux
index 887b855d74..841ba9c51a 100644
--- a/tests/ref/fate/xmv-demux
+++ b/tests/ref/fate/xmv-demux
@@ -1,181 +1,183 @@
-0, 0, 1508, 0xefceba48
-1, 0, 5976, 0xfa2c2db9
-1, 10841, 5976, 0x256b935c
-1, 21682, 5976, 0xa78a9563
-1, 32522, 5976, 0x4ea056f4
-1, 43363, 5976, 0xda772d8d
-1, 54204, 5976, 0xafacf7c9
-0, 57600, 108, 0x06713c96
-0, 61200, 952, 0xd306df7e
-0, 64800, 2312, 0xaf316585
-1, 65045, 5976, 0xdeb003f4
-0, 68400, 3872, 0xfc1c527c
-0, 72000, 20, 0xaffc0edd
-0, 75600, 6600, 0xe1b66c7f
-1, 75886, 2016, 0xa7380d36
-0, 79200, 6868, 0xd5b3f631
-1, 79543, 2016, 0xbc090bac
-0, 82800, 8420, 0xf70ee33b
-1, 83200, 2016, 0x6f8c164c
-0, 86400, 13144, 0x9a54ef39
-1, 86857, 2016, 0x13b80e28
-0, 90000, 6340, 0xe55bf555
-1, 90514, 2016, 0xd40ff863
-0, 93600, 3736, 0x0b23f89f
-1, 94171, 2016, 0x4d530ed7
-0, 97200, 2624, 0x79e2e451
-1, 97829, 2160, 0x0fbc37eb
-0, 100800, 1860, 0x63886f11
-1, 101747, 13824, 0x82fb2602
-0, 104400, 1244, 0x74594601
-0, 108000, 564, 0xf4561dfb
-0, 111600, 80, 0xbf8e2e30
-0, 115200, 20, 0xa0990c29
-1, 126824, 13824, 0x08771caf
-1, 151902, 13824, 0xdf7d4a65
-1, 176980, 13896, 0x24bf3f47
-1, 202188, 3600, 0x9ad26b9f
-1, 208718, 3600, 0x8c666fd6
-1, 215249, 3600, 0x305c6ca1
-1, 221780, 3600, 0x48b04e1e
-0, 223200, 104, 0x12413980
-0, 226800, 796, 0x2e698ed3
-1, 228310, 3600, 0x8c915935
-0, 230400, 1808, 0x8b3e6e5e
-0, 234000, 4712, 0xdbd51737
-1, 234841, 3600, 0xa8f45e01
-0, 237600, 5548, 0xee9c831c
-0, 241200, 6152, 0x9c18ccc1
-1, 241371, 3816, 0xc64cc5ed
-0, 244800, 6452, 0x7860462a
-1, 248294, 1944, 0x0ac2e3f1
-0, 248400, 6676, 0xe1b1c9e4
-1, 251820, 1944, 0x2197dccd
-0, 252000, 10904, 0x0bded7b7
-1, 255347, 1944, 0x0c02e77f
-0, 255600, 12844, 0xe6d16cff
-1, 258873, 1944, 0x675ee06a
-0, 259200, 10920, 0xe114c46b
-1, 262400, 2160, 0x0d803a8b
-0, 262800, 5952, 0xb7464634
-1, 266318, 6696, 0xa7a0dfea
-0, 266400, 4732, 0x2fa2e36d
-0, 270000, 2592, 0xf54ddd57
-0, 273600, 1516, 0x4a1cd4d5
-0, 277200, 864, 0x49889afc
-1, 278465, 6696, 0x59aa3145
-0, 280800, 468, 0x3932e6a4
-0, 284400, 116, 0x2b8341e6
-0, 288000, 16, 0x6a3109cf
-1, 290612, 6696, 0x69be4d78
-1, 302759, 6696, 0x64064c67
-1, 314906, 6696, 0xc8536f98
-1, 327053, 6696, 0xc0ce5199
-1, 339200, 6768, 0x3b275c58
-1, 351478, 8856, 0x90e5b37c
-0, 360000, 1508, 0xefceba48
-1, 367543, 8856, 0x86b33366
-1, 383608, 8856, 0x19e18797
-1, 399673, 8856, 0x0a0c7fbd
-1, 415739, 8928, 0x4a9b2d42
-0, 417600, 100, 0x45023894
-0, 421200, 948, 0xa65ed345
-0, 424800, 2808, 0xd7285746
-0, 428400, 5372, 0x05794175
-1, 431935, 1512, 0xed8b3f4b
-0, 432000, 11596, 0x8636eca7
-1, 434678, 1512, 0xa27d3891
-0, 435600, 11524, 0xe1f39be3
-1, 437420, 1512, 0xb0f13eb6
-0, 439200, 23392, 0xab053f05
-1, 440163, 1656, 0xe5a98324
-0, 442800, 4560, 0x03197d07
-1, 443167, 2232, 0x15445433
-0, 446400, 4440, 0x1cc361a2
-1, 447216, 2232, 0x5cb348a9
-0, 450000, 23688, 0x16030634
-1, 451265, 2232, 0xf10347da
-0, 453600, 16132, 0xf0eca799
-1, 455314, 2448, 0x3e16a175
-0, 457200, 29896, 0x0c0988ea
-1, 459755, 2520, 0x17e3ca2b
-0, 460800, 19956, 0x0093aa0b
-1, 464327, 1944, 0x35c2de84
-0, 464400, 16392, 0x8829a9ca
-1, 467853, 1944, 0x55b4db40
-0, 468000, 16772, 0x9a4a546d
-1, 471380, 2088, 0xdaae14b2
-0, 471600, 8920, 0xcd8ca203
-1, 475167, 1944, 0x92ccd37f
-0, 475200, 9632, 0x53c1d37b
-1, 478694, 1944, 0x70efede1
-0, 478800, 8976, 0xfe4da2cc
-1, 482220, 1944, 0x7601d304
-0, 482400, 6680, 0x35348fe0
-1, 485747, 1944, 0x3922ebc2
-0, 486000, 9228, 0xcbf62b0c
-1, 489273, 2160, 0xde462f2e
-0, 489600, 5108, 0xd1d88511
-1, 493192, 1872, 0x467ac1d2
-0, 493200, 10016, 0xaff4b2b2
-1, 496588, 1872, 0xa1e4cd43
-0, 496800, 7468, 0x23e81ab8
-1, 499984, 1872, 0x1dceccc6
-0, 500400, 4172, 0x253cd05b
-1, 503380, 1872, 0x2bbad2a5
-0, 504000, 8188, 0x7ede743f
-1, 506776, 1872, 0xc603d44d
-0, 507600, 2884, 0x2dec55a3
-1, 510171, 1872, 0x1b4cc261
-0, 511200, 3900, 0xd0666a18
-1, 513567, 1872, 0x10edd6cf
-0, 514800, 2996, 0x9cc99b8c
-1, 516963, 2376, 0xecdb9d61
-0, 518400, 2156, 0xae612776
-1, 521273, 2592, 0x5559eced
-0, 522000, 3988, 0x0d2c9992
-0, 525600, 1512, 0x6281fc00
-1, 525976, 2592, 0x8848dfc7
-0, 529200, 6544, 0xb75c2562
-1, 530678, 2592, 0x4ca2d7da
-0, 532800, 4108, 0xfb21efc9
-1, 535380, 2592, 0x285fd7e6
-0, 536400, 1096, 0x85922a37
-0, 540000, 9740, 0xe57d7647
-1, 540082, 2592, 0x2717e404
-0, 543600, 416, 0x61c2ea02
-1, 544784, 2592, 0xf106111a
-0, 547200, 336, 0x1dc5ac1c
-1, 549486, 2592, 0xd7d01119
-0, 550800, 204, 0x16f57017
-1, 554188, 2592, 0x550cfeda
-0, 554400, 112, 0x78374234
-0, 558000, 40, 0x6cb21985
-1, 558890, 2592, 0x47ad00c4
-1, 563592, 2592, 0x39bbf306
-1, 568294, 3240, 0x69addfce
-1, 574171, 21384, 0x254f63e0
-1, 612963, 21456, 0x2f7a9859
-0, 615600, 14420, 0x53324ca4
-0, 619200, 40, 0x10971420
-1, 651886, 37512, 0x6e962928
-1, 719935, 2736, 0x1dc91c69
-0, 720000, 24904, 0x15574f7e
-1, 724898, 2736, 0x023434fd
-1, 729861, 2736, 0x906f1541
-0, 734400, 1908, 0xccb2dd3c
-1, 734824, 2736, 0x85a31102
-0, 738000, 4676, 0xbfa42b7e
-1, 739788, 3024, 0x9296a5f3
-0, 741600, 3600, 0x87c9dc58
-0, 745200, 8184, 0x504a8e65
-1, 745273, 1944, 0x7bf4dedc
-0, 748800, 9636, 0x2efb3006
-1, 748800, 1944, 0x4196c404
-1, 752327, 1944, 0xcda97c7a
-0, 752400, 9580, 0x0fb6f4e8
-1, 755853, 1944, 0x5f4922b2
-0, 756000, 7840, 0xe996f564
-1, 759380, 2088, 0x37dfc157
-0, 759600, 4208, 0xe9c2fba2
-0, 763200, 556, 0x3f1e077c
+#tb 0: 1/1000
+#tb 1: 16/11025
+0,          0,          0,        0,     1508, 0xefceba48
+1,          0,          0,       83,     5976, 0xfa2c2db9
+1,         83,         83,       83,     5976, 0x256b935c
+1,        166,        166,       83,     5976, 0xa78a9563
+1,        249,        249,       83,     5976, 0x4ea056f4
+1,        332,        332,       83,     5976, 0xda772d8d
+1,        415,        415,       83,     5976, 0xafacf7c9
+0,        640,        640,        0,      108, 0x06713c96
+0,        680,        680,        0,      952, 0xd306df7e
+0,        720,        720,        0,     2312, 0xaf316585
+1,        498,        498,       83,     5976, 0xdeb003f4
+0,        760,        760,        0,     3872, 0xfc1c527c
+0,        800,        800,        0,       20, 0xaffc0edd
+0,        840,        840,        0,     6600, 0xe1b66c7f
+1,        581,        581,       28,     2016, 0xa7380d36
+0,        880,        880,        0,     6868, 0xd5b3f631
+1,        609,        609,       28,     2016, 0xbc090bac
+0,        920,        920,        0,     8420, 0xf70ee33b
+1,        637,        637,       28,     2016, 0x6f8c164c
+0,        960,        960,        0,    13144, 0x9a54ef39
+1,        665,        665,       28,     2016, 0x13b80e28
+0,       1000,       1000,        0,     6340, 0xe55bf555
+1,        693,        693,       28,     2016, 0xd40ff863
+0,       1040,       1040,        0,     3736, 0x0b23f89f
+1,        721,        721,       28,     2016, 0x4d530ed7
+0,       1080,       1080,        0,     2624, 0x79e2e451
+1,        749,        749,       30,     2160, 0x0fbc37eb
+0,       1120,       1120,        0,     1860, 0x63886f11
+1,        779,        779,      192,    13824, 0x82fb2602
+0,       1160,       1160,        0,     1244, 0x74594601
+0,       1200,       1200,        0,      564, 0xf4561dfb
+0,       1240,       1240,        0,       80, 0xbf8e2e30
+0,       1280,       1280,        0,       20, 0xa0990c29
+1,        971,        971,      192,    13824, 0x08771caf
+1,       1163,       1163,      192,    13824, 0xdf7d4a65
+1,       1355,       1355,      193,    13896, 0x24bf3f47
+1,       1548,       1548,       50,     3600, 0x9ad26b9f
+1,       1598,       1598,       50,     3600, 0x8c666fd6
+1,       1648,       1648,       50,     3600, 0x305c6ca1
+1,       1698,       1698,       50,     3600, 0x48b04e1e
+0,       2480,       2480,        0,      104, 0x12413980
+0,       2520,       2520,        0,      796, 0x2e698ed3
+1,       1748,       1748,       50,     3600, 0x8c915935
+0,       2560,       2560,        0,     1808, 0x8b3e6e5e
+0,       2600,       2600,        0,     4712, 0xdbd51737
+1,       1798,       1798,       50,     3600, 0xa8f45e01
+0,       2640,       2640,        0,     5548, 0xee9c831c
+0,       2680,       2680,        0,     6152, 0x9c18ccc1
+1,       1848,       1848,       53,     3816, 0xc64cc5ed
+0,       2720,       2720,        0,     6452, 0x7860462a
+1,       1901,       1901,       27,     1944, 0x0ac2e3f1
+0,       2760,       2760,        0,     6676, 0xe1b1c9e4
+1,       1928,       1928,       27,     1944, 0x2197dccd
+0,       2800,       2800,        0,    10904, 0x0bded7b7
+1,       1955,       1955,       27,     1944, 0x0c02e77f
+0,       2840,       2840,        0,    12844, 0xe6d16cff
+1,       1982,       1982,       27,     1944, 0x675ee06a
+0,       2880,       2880,        0,    10920, 0xe114c46b
+1,       2009,       2009,       30,     2160, 0x0d803a8b
+0,       2920,       2920,        0,     5952, 0xb7464634
+1,       2039,       2039,       93,     6696, 0xa7a0dfea
+0,       2960,       2960,        0,     4732, 0x2fa2e36d
+0,       3000,       3000,        0,     2592, 0xf54ddd57
+0,       3040,       3040,        0,     1516, 0x4a1cd4d5
+0,       3080,       3080,        0,      864, 0x49889afc
+1,       2132,       2132,       93,     6696, 0x59aa3145
+0,       3120,       3120,        0,      468, 0x3932e6a4
+0,       3160,       3160,        0,      116, 0x2b8341e6
+0,       3200,       3200,        0,       16, 0x6a3109cf
+1,       2225,       2225,       93,     6696, 0x69be4d78
+1,       2318,       2318,       93,     6696, 0x64064c67
+1,       2411,       2411,       93,     6696, 0xc8536f98
+1,       2504,       2504,       93,     6696, 0xc0ce5199
+1,       2597,       2597,       94,     6768, 0x3b275c58
+1,       2691,       2691,      123,     8856, 0x90e5b37c
+0,       4000,       4000,        0,     1508, 0xefceba48
+1,       2814,       2814,      123,     8856, 0x86b33366
+1,       2937,       2937,      123,     8856, 0x19e18797
+1,       3060,       3060,      123,     8856, 0x0a0c7fbd
+1,       3183,       3183,      124,     8928, 0x4a9b2d42
+0,       4640,       4640,        0,      100, 0x45023894
+0,       4680,       4680,        0,      948, 0xa65ed345
+0,       4720,       4720,        0,     2808, 0xd7285746
+0,       4760,       4760,       40,     5372, 0x05794175
+1,       3307,       3307,       21,     1512, 0xed8b3f4b
+0,       4800,       4800,       40,    11596, 0x8636eca7
+1,       3328,       3328,       21,     1512, 0xa27d3891
+0,       4840,       4840,       40,    11524, 0xe1f39be3
+1,       3349,       3349,       21,     1512, 0xb0f13eb6
+0,       4880,       4880,       40,    23392, 0xab053f05
+1,       3370,       3370,       23,     1656, 0xe5a98324
+0,       4920,       4920,       40,     4560, 0x03197d07
+1,       3393,       3393,       31,     2232, 0x15445433
+0,       4960,       4960,       40,     4440, 0x1cc361a2
+1,       3424,       3424,       31,     2232, 0x5cb348a9
+0,       5000,       5000,       40,    23688, 0x16030634
+1,       3455,       3455,       31,     2232, 0xf10347da
+0,       5040,       5040,       40,    16132, 0xf0eca799
+1,       3486,       3486,       34,     2448, 0x3e16a175
+0,       5080,       5080,       40,    29896, 0x0c0988ea
+1,       3520,       3520,       35,     2520, 0x17e3ca2b
+0,       5120,       5120,       40,    19956, 0x0093aa0b
+1,       3555,       3555,       27,     1944, 0x35c2de84
+0,       5160,       5160,       40,    16392, 0x8829a9ca
+1,       3582,       3582,       27,     1944, 0x55b4db40
+0,       5200,       5200,       40,    16772, 0x9a4a546d
+1,       3609,       3609,       29,     2088, 0xdaae14b2
+0,       5240,       5240,       40,     8920, 0xcd8ca203
+1,       3638,       3638,       27,     1944, 0x92ccd37f
+0,       5280,       5280,       40,     9632, 0x53c1d37b
+1,       3665,       3665,       27,     1944, 0x70efede1
+0,       5320,       5320,       40,     8976, 0xfe4da2cc
+1,       3692,       3692,       27,     1944, 0x7601d304
+0,       5360,       5360,       40,     6680, 0x35348fe0
+1,       3719,       3719,       27,     1944, 0x3922ebc2
+0,       5400,       5400,       40,     9228, 0xcbf62b0c
+1,       3746,       3746,       30,     2160, 0xde462f2e
+0,       5440,       5440,       40,     5108, 0xd1d88511
+1,       3776,       3776,       26,     1872, 0x467ac1d2
+0,       5480,       5480,       40,    10016, 0xaff4b2b2
+1,       3802,       3802,       26,     1872, 0xa1e4cd43
+0,       5520,       5520,       40,     7468, 0x23e81ab8
+1,       3828,       3828,       26,     1872, 0x1dceccc6
+0,       5560,       5560,       40,     4172, 0x253cd05b
+1,       3854,       3854,       26,     1872, 0x2bbad2a5
+0,       5600,       5600,       40,     8188, 0x7ede743f
+1,       3880,       3880,       26,     1872, 0xc603d44d
+0,       5640,       5640,       40,     2884, 0x2dec55a3
+1,       3906,       3906,       26,     1872, 0x1b4cc261
+0,       5680,       5680,       40,     3900, 0xd0666a18
+1,       3932,       3932,       26,     1872, 0x10edd6cf
+0,       5720,       5720,       40,     2996, 0x9cc99b8c
+1,       3958,       3958,       33,     2376, 0xecdb9d61
+0,       5760,       5760,       40,     2156, 0xae612776
+1,       3991,       3991,       36,     2592, 0x5559eced
+0,       5800,       5800,       40,     3988, 0x0d2c9992
+0,       5840,       5840,       40,     1512, 0x6281fc00
+1,       4027,       4027,       36,     2592, 0x8848dfc7
+0,       5880,       5880,       40,     6544, 0xb75c2562
+1,       4063,       4063,       36,     2592, 0x4ca2d7da
+0,       5920,       5920,       40,     4108, 0xfb21efc9
+1,       4099,       4099,       36,     2592, 0x285fd7e6
+0,       5960,       5960,       40,     1096, 0x85922a37
+0,       6000,       6000,       40,     9740, 0xe57d7647
+1,       4135,       4135,       36,     2592, 0x2717e404
+0,       6040,       6040,       40,      416, 0x61c2ea02
+1,       4171,       4171,       36,     2592, 0xf106111a
+0,       6080,       6080,       40,      336, 0x1dc5ac1c
+1,       4207,       4207,       36,     2592, 0xd7d01119
+0,       6120,       6120,       40,      204, 0x16f57017
+1,       4243,       4243,       36,     2592, 0x550cfeda
+0,       6160,       6160,       40,      112, 0x78374234
+0,       6200,       6200,       40,       40, 0x6cb21985
+1,       4279,       4279,       36,     2592, 0x47ad00c4
+1,       4315,       4315,       36,     2592, 0x39bbf306
+1,       4351,       4351,       45,     3240, 0x69addfce
+1,       4396,       4396,      297,    21384, 0x254f63e0
+1,       4693,       4693,      298,    21456, 0x2f7a9859
+0,       6840,       6840,       40,    14420, 0x53324ca4
+0,       6880,       6880,       40,       40, 0x10971420
+1,       4991,       4991,      521,    37512, 0x6e962928
+1,       5512,       5512,       38,     2736, 0x1dc91c69
+0,       8000,       8000,       40,    24904, 0x15574f7e
+1,       5550,       5550,       38,     2736, 0x023434fd
+1,       5588,       5588,       38,     2736, 0x906f1541
+0,       8160,       8160,       40,     1908, 0xccb2dd3c
+1,       5626,       5626,       38,     2736, 0x85a31102
+0,       8200,       8200,       40,     4676, 0xbfa42b7e
+1,       5664,       5664,       42,     3024, 0x9296a5f3
+0,       8240,       8240,       40,     3600, 0x87c9dc58
+0,       8280,       8280,       40,     8184, 0x504a8e65
+1,       5706,       5706,       27,     1944, 0x7bf4dedc
+0,       8320,       8320,       40,     9636, 0x2efb3006
+1,       5733,       5733,       27,     1944, 0x4196c404
+1,       5760,       5760,       27,     1944, 0xcda97c7a
+0,       8360,       8360,       40,     9580, 0x0fb6f4e8
+1,       5787,       5787,       27,     1944, 0x5f4922b2
+0,       8400,       8400,       40,     7840, 0xe996f564
+1,       5814,       5814,       29,     2088, 0x37dfc157
+0,       8440,       8440,       40,     4208, 0xe9c2fba2
+0,       8480,       8480,       40,      556, 0x3f1e077c