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, 143 insertions, 141 deletions

diff --git a/tests/ref/fate/bethsoft-vid b/tests/ref/fate/bethsoft-vid
index 4f20c1d277..7599bf018c 100644
--- a/tests/ref/fate/bethsoft-vid
+++ b/tests/ref/fate/bethsoft-vid
@@ -1,141 +1,143 @@
-1, 0, 1480, 0x00000000
-0, 1500, 192000, 0x00000000
-1, 5994, 1480, 0x20a92bd4
-0, 7500, 192000, 0x5a5acf57
-1, 11988, 1850, 0xa9e48a74
-0, 15000, 192000, 0xbd055cf1
-1, 19481, 1480, 0x23ecd018
-0, 21000, 192000, 0x28b1eefc
-1, 25475, 1480, 0x206bb915
-0, 27000, 192000, 0x0636bacd
-1, 31469, 1850, 0xb0e10e75
-0, 34500, 192000, 0xbfd33cbd
-1, 38961, 1480, 0x8d9baedd
-0, 40500, 192000, 0x0bd150ef
-1, 44955, 1480, 0xb802aae1
-0, 46500, 192000, 0x780d891e
-1, 50950, 1480, 0xecd7b5cc
-0, 52500, 192000, 0xacf5e205
-1, 56944, 1850, 0x16861355
-0, 60000, 192000, 0x37c900dc
-1, 64436, 1480, 0xa51690bd
-0, 66000, 192000, 0x4ee6add7
-1, 70430, 1480, 0xdd0b90d1
-0, 72000, 192000, 0x1844783a
-1, 76424, 1850, 0x3ce6e333
-0, 79500, 192000, 0x7bf84848
-1, 83917, 1480, 0xf8ce8ea3
-0, 85500, 192000, 0x1ec296bc
-1, 89911, 1480, 0xda4597af
-0, 91500, 192000, 0xbaeb5292
-1, 95905, 1480, 0x918f7cb3
-0, 97500, 192000, 0xcb18038d
-1, 101899, 1850, 0xca6edb15
-0, 105000, 192000, 0xb3cc8b65
-1, 109392, 1480, 0xba279597
-0, 111000, 192000, 0x6f164685
-1, 115386, 1480, 0xc5a38a9e
-0, 117000, 192000, 0x304917c9
-1, 121380, 1850, 0x8147eef5
-0, 124500, 192000, 0x8269daa1
-1, 128872, 1480, 0xce2c7cb5
-0, 130500, 192000, 0x04d3500d
-1, 134866, 1480, 0x4282819f
-0, 136500, 192000, 0x9788f7a5
-1, 140860, 1480, 0xbdbb8da6
-0, 142500, 192000, 0x05351c98
-1, 146854, 1850, 0xdbbeea10
-0, 150000, 192000, 0xcc8bba97
-1, 154347, 1480, 0xbe6a77c2
-0, 156000, 192000, 0x76caf27b
-1, 160341, 1480, 0xa85c75b2
-0, 162000, 192000, 0x28648040
-1, 166335, 1850, 0xa45bde21
-0, 169500, 192000, 0x99ea251f
-1, 173828, 1480, 0x84aa7895
-0, 175500, 192000, 0x20e7bf4d
-1, 179822, 1480, 0x147f7d9f
-0, 181500, 192000, 0x046ed625
-1, 185816, 1480, 0xc8e77b85
-0, 187500, 192000, 0x1613fb12
-1, 191810, 1850, 0x10d4d81b
-0, 195000, 192000, 0xd8b52d16
-1, 199302, 1480, 0xb4ae8bb1
-0, 201000, 192000, 0x31443aa9
-1, 205297, 1480, 0x3ef782a5
-0, 207000, 192000, 0xd426de3d
-1, 211291, 1850, 0xdeebda14
-0, 214500, 192000, 0xb2bce77b
-1, 218783, 1480, 0x4c7e7bbb
-0, 220500, 192000, 0x25a52805
-1, 224777, 1480, 0x0e0e9198
-0, 226500, 192000, 0x04f03a87
-1, 230771, 1480, 0x5c1f819f
-0, 232500, 192000, 0x41d56889
-1, 236765, 1850, 0x0e4cf6ff
-0, 240000, 192000, 0x3d4d6de9
-1, 244258, 1480, 0x374388a7
-0, 246000, 192000, 0xa7a2abfe
-1, 250252, 1480, 0xed729389
-0, 252000, 192000, 0x663e9fca
-1, 256246, 1850, 0xe0f1e43f
-0, 259500, 192000, 0x29a67f86
-1, 263739, 1480, 0x3b27839a
-0, 265500, 192000, 0x51531bb0
-1, 269733, 1480, 0xe6287e94
-0, 271500, 192000, 0xd993277e
-1, 275727, 1480, 0x7e0d84b5
-0, 277500, 192000, 0x4873e583
-1, 281721, 1850, 0xf08bebf7
-0, 285000, 192000, 0x06df053b
-1, 289213, 1480, 0x94cf73a0
-0, 291000, 192000, 0x044f7698
-1, 295207, 1480, 0xfef384ae
-0, 297000, 192000, 0xc2302a45
-1, 301202, 1850, 0x3b93e0f7
-0, 304500, 192000, 0xbdfec8ee
-1, 308694, 1480, 0x28d27bae
-0, 310500, 192000, 0x3b739286
-1, 314688, 1480, 0x94d57da5
-0, 316500, 192000, 0x3ca82cd6
-1, 320682, 1480, 0xc9327db5
-0, 322500, 192000, 0x25af10f2
-1, 326676, 1850, 0xe781f604
-0, 330000, 192000, 0x09ce32bf
-1, 334169, 1480, 0x752f8c5b
-0, 336000, 192000, 0xdab399c2
-1, 340163, 1480, 0x30068032
-0, 342000, 192000, 0x77400d93
-1, 346157, 1850, 0x7895023e
-0, 349500, 192000, 0x5e8e6fe7
-1, 353650, 1480, 0xa1e0a6e1
-0, 355500, 192000, 0x277506c9
-1, 359644, 1480, 0x6af4b500
-0, 361500, 192000, 0xe91b59ac
-1, 365638, 1480, 0xc26ea4c7
-0, 367500, 192000, 0xc2aa6e19
-1, 371632, 1850, 0x16a72419
-0, 375000, 192000, 0x12c63645
-1, 379124, 1480, 0x1794aacc
-0, 381000, 192000, 0xa39f27d6
-1, 385118, 1480, 0x2ecad8d0
-0, 387000, 192000, 0x20c32512
-1, 391112, 1850, 0x2e645e07
-0, 394500, 192000, 0x385a26a0
-1, 398605, 1480, 0x1c54dfe7
-0, 400500, 192000, 0x2566a70c
-1, 404599, 1480, 0xbd35feec
-0, 406500, 192000, 0x7105cfb9
-1, 410593, 1480, 0x419403d6
-0, 412500, 192000, 0x725671a2
-1, 416587, 1850, 0x78699d2a
-0, 420000, 192000, 0x3ff2782a
-1, 424080, 1480, 0x74ec68e0
-0, 426000, 192000, 0xdc0571c3
-1, 430074, 1480, 0x76af64d9
-0, 432000, 192000, 0x4a6a5405
-1, 436068, 1850, 0x5a303d1a
-0, 439500, 192000, 0x3ec3cce1
-1, 443560, 1074, 0x142ce7ba
-0, 445500, 192000, 0x159313a8
-1, 447910, 1850, 0x7ff682f7
+#tb 0: 1/60
+#tb 1: 1/11111
+1,          0,          0,      740,     1480, 0x00000000
+0,          1,          1,        1,   192000, 0x00000000
+1,        740,        740,      740,     1480, 0x20a92bd4
+0,          5,          5,        1,   192000, 0x5a5acf57
+1,       1480,       1480,      925,     1850, 0xa9e48a74
+0,         10,         10,        1,   192000, 0xbd055cf1
+1,       2405,       2405,      740,     1480, 0x23ecd018
+0,         14,         14,        1,   192000, 0x28b1eefc
+1,       3145,       3145,      740,     1480, 0x206bb915
+0,         18,         18,        1,   192000, 0x0636bacd
+1,       3885,       3885,      925,     1850, 0xb0e10e75
+0,         23,         23,        1,   192000, 0xbfd33cbd
+1,       4810,       4810,      740,     1480, 0x8d9baedd
+0,         27,         27,        1,   192000, 0x0bd150ef
+1,       5550,       5550,      740,     1480, 0xb802aae1
+0,         31,         31,        1,   192000, 0x780d891e
+1,       6290,       6290,      740,     1480, 0xecd7b5cc
+0,         35,         35,        1,   192000, 0xacf5e205
+1,       7030,       7030,      925,     1850, 0x16861355
+0,         40,         40,        1,   192000, 0x37c900dc
+1,       7955,       7955,      740,     1480, 0xa51690bd
+0,         44,         44,        1,   192000, 0x4ee6add7
+1,       8695,       8695,      740,     1480, 0xdd0b90d1
+0,         48,         48,        1,   192000, 0x1844783a
+1,       9435,       9435,      925,     1850, 0x3ce6e333
+0,         53,         53,        1,   192000, 0x7bf84848
+1,      10360,      10360,      740,     1480, 0xf8ce8ea3
+0,         57,         57,        1,   192000, 0x1ec296bc
+1,      11100,      11100,      740,     1480, 0xda4597af
+0,         61,         61,        1,   192000, 0xbaeb5292
+1,      11840,      11840,      740,     1480, 0x918f7cb3
+0,         65,         65,        1,   192000, 0xcb18038d
+1,      12580,      12580,      925,     1850, 0xca6edb15
+0,         70,         70,        1,   192000, 0xb3cc8b65
+1,      13505,      13505,      740,     1480, 0xba279597
+0,         74,         74,        1,   192000, 0x6f164685
+1,      14245,      14245,      740,     1480, 0xc5a38a9e
+0,         78,         78,        1,   192000, 0x304917c9
+1,      14985,      14985,      925,     1850, 0x8147eef5
+0,         83,         83,        1,   192000, 0x8269daa1
+1,      15910,      15910,      740,     1480, 0xce2c7cb5
+0,         87,         87,        1,   192000, 0x04d3500d
+1,      16650,      16650,      740,     1480, 0x4282819f
+0,         91,         91,        1,   192000, 0x9788f7a5
+1,      17390,      17390,      740,     1480, 0xbdbb8da6
+0,         95,         95,        1,   192000, 0x05351c98
+1,      18130,      18130,      925,     1850, 0xdbbeea10
+0,        100,        100,        1,   192000, 0xcc8bba97
+1,      19055,      19055,      740,     1480, 0xbe6a77c2
+0,        104,        104,        1,   192000, 0x76caf27b
+1,      19795,      19795,      740,     1480, 0xa85c75b2
+0,        108,        108,        1,   192000, 0x28648040
+1,      20535,      20535,      925,     1850, 0xa45bde21
+0,        113,        113,        1,   192000, 0x99ea251f
+1,      21460,      21460,      740,     1480, 0x84aa7895
+0,        117,        117,        1,   192000, 0x20e7bf4d
+1,      22200,      22200,      740,     1480, 0x147f7d9f
+0,        121,        121,        1,   192000, 0x046ed625
+1,      22940,      22940,      740,     1480, 0xc8e77b85
+0,        125,        125,        1,   192000, 0x1613fb12
+1,      23680,      23680,      925,     1850, 0x10d4d81b
+0,        130,        130,        1,   192000, 0xd8b52d16
+1,      24605,      24605,      740,     1480, 0xb4ae8bb1
+0,        134,        134,        1,   192000, 0x31443aa9
+1,      25345,      25345,      740,     1480, 0x3ef782a5
+0,        138,        138,        1,   192000, 0xd426de3d
+1,      26085,      26085,      925,     1850, 0xdeebda14
+0,        143,        143,        1,   192000, 0xb2bce77b
+1,      27010,      27010,      740,     1480, 0x4c7e7bbb
+0,        147,        147,        1,   192000, 0x25a52805
+1,      27750,      27750,      740,     1480, 0x0e0e9198
+0,        151,        151,        1,   192000, 0x04f03a87
+1,      28490,      28490,      740,     1480, 0x5c1f819f
+0,        155,        155,        1,   192000, 0x41d56889
+1,      29230,      29230,      925,     1850, 0x0e4cf6ff
+0,        160,        160,        1,   192000, 0x3d4d6de9
+1,      30155,      30155,      740,     1480, 0x374388a7
+0,        164,        164,        1,   192000, 0xa7a2abfe
+1,      30895,      30895,      740,     1480, 0xed729389
+0,        168,        168,        1,   192000, 0x663e9fca
+1,      31635,      31635,      925,     1850, 0xe0f1e43f
+0,        173,        173,        1,   192000, 0x29a67f86
+1,      32560,      32560,      740,     1480, 0x3b27839a
+0,        177,        177,        1,   192000, 0x51531bb0
+1,      33300,      33300,      740,     1480, 0xe6287e94
+0,        181,        181,        1,   192000, 0xd993277e
+1,      34040,      34040,      740,     1480, 0x7e0d84b5
+0,        185,        185,        1,   192000, 0x4873e583
+1,      34780,      34780,      925,     1850, 0xf08bebf7
+0,        190,        190,        1,   192000, 0x06df053b
+1,      35705,      35705,      740,     1480, 0x94cf73a0
+0,        194,        194,        1,   192000, 0x044f7698
+1,      36445,      36445,      740,     1480, 0xfef384ae
+0,        198,        198,        1,   192000, 0xc2302a45
+1,      37185,      37185,      925,     1850, 0x3b93e0f7
+0,        203,        203,        1,   192000, 0xbdfec8ee
+1,      38110,      38110,      740,     1480, 0x28d27bae
+0,        207,        207,        1,   192000, 0x3b739286
+1,      38850,      38850,      740,     1480, 0x94d57da5
+0,        211,        211,        1,   192000, 0x3ca82cd6
+1,      39590,      39590,      740,     1480, 0xc9327db5
+0,        215,        215,        1,   192000, 0x25af10f2
+1,      40330,      40330,      925,     1850, 0xe781f604
+0,        220,        220,        1,   192000, 0x09ce32bf
+1,      41255,      41255,      740,     1480, 0x752f8c5b
+0,        224,        224,        1,   192000, 0xdab399c2
+1,      41995,      41995,      740,     1480, 0x30068032
+0,        228,        228,        1,   192000, 0x77400d93
+1,      42735,      42735,      925,     1850, 0x7895023e
+0,        233,        233,        1,   192000, 0x5e8e6fe7
+1,      43660,      43660,      740,     1480, 0xa1e0a6e1
+0,        237,        237,        1,   192000, 0x277506c9
+1,      44400,      44400,      740,     1480, 0x6af4b500
+0,        241,        241,        1,   192000, 0xe91b59ac
+1,      45140,      45140,      740,     1480, 0xc26ea4c7
+0,        245,        245,        1,   192000, 0xc2aa6e19
+1,      45880,      45880,      925,     1850, 0x16a72419
+0,        250,        250,        1,   192000, 0x12c63645
+1,      46805,      46805,      740,     1480, 0x1794aacc
+0,        254,        254,        1,   192000, 0xa39f27d6
+1,      47545,      47545,      740,     1480, 0x2ecad8d0
+0,        258,        258,        1,   192000, 0x20c32512
+1,      48285,      48285,      925,     1850, 0x2e645e07
+0,        263,        263,        1,   192000, 0x385a26a0
+1,      49210,      49210,      740,     1480, 0x1c54dfe7
+0,        267,        267,        1,   192000, 0x2566a70c
+1,      49950,      49950,      740,     1480, 0xbd35feec
+0,        271,        271,        1,   192000, 0x7105cfb9
+1,      50690,      50690,      740,     1480, 0x419403d6
+0,        275,        275,        1,   192000, 0x725671a2
+1,      51430,      51430,      925,     1850, 0x78699d2a
+0,        280,        280,        1,   192000, 0x3ff2782a
+1,      52355,      52355,      740,     1480, 0x74ec68e0
+0,        284,        284,        1,   192000, 0xdc0571c3
+1,      53095,      53095,      740,     1480, 0x76af64d9
+0,        288,        288,        1,   192000, 0x4a6a5405
+1,      53835,      53835,      925,     1850, 0x5a303d1a
+0,        293,        293,        1,   192000, 0x3ec3cce1
+1,      54760,      54760,      537,     1074, 0x142ce7ba
+0,        297,        297,        1,   192000, 0x159313a8
+1,      55297,      55297,      925,     1850, 0x7ff682f7