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/h264-conformance-mps_mw_a b/tests/ref/fate/h264-conformance-mps_mw_a
index 47e7feb36a..959a0ae681 100644
--- a/tests/ref/fate/h264-conformance-mps_mw_a
+++ b/tests/ref/fate/h264-conformance-mps_mw_a
@@ -1,150 +1,151 @@
-0, 0, 38016, 0x06150e88
-0, 3600, 38016, 0x32d90103
-0, 7200, 38016, 0x5b5f2fae
-0, 10800, 38016, 0xba6e6302
-0, 14400, 38016, 0x6c4b8e95
-0, 18000, 38016, 0x6d51ab43
-0, 21600, 38016, 0x5582a7c5
-0, 25200, 38016, 0xf48e6545
-0, 28800, 38016, 0x083a8481
-0, 32400, 38016, 0x0576a254
-0, 36000, 38016, 0x07429a61
-0, 39600, 38016, 0xd1e26eb1
-0, 43200, 38016, 0x94032564
-0, 46800, 38016, 0xc9d217c0
-0, 50400, 38016, 0xf0ee3f46
-0, 54000, 38016, 0xe8fc4d97
-0, 57600, 38016, 0xd3b0488d
-0, 61200, 38016, 0xc4243d99
-0, 64800, 38016, 0xa65b36ed
-0, 68400, 38016, 0x84ca1844
-0, 72000, 38016, 0xcd6706bf
-0, 75600, 38016, 0x1c03ec0a
-0, 79200, 38016, 0xf1380127
-0, 82800, 38016, 0xa499e0a5
-0, 86400, 38016, 0x5fca87ce
-0, 90000, 38016, 0x0b385064
-0, 93600, 38016, 0x6a4f49c4
-0, 97200, 38016, 0x97e0464b
-0, 100800, 38016, 0xcbf98750
-0, 104400, 38016, 0xa9efe0cd
-0, 108000, 38016, 0x9ea7d82e
-0, 111600, 38016, 0x28cec5ce
-0, 115200, 38016, 0xaec6ac1e
-0, 118800, 38016, 0x8cba69b3
-0, 122400, 38016, 0x727720c1
-0, 126000, 38016, 0xee4f4822
-0, 129600, 38016, 0x9d456e11
-0, 133200, 38016, 0x14123f91
-0, 136800, 38016, 0xf5e1d1a3
-0, 140400, 38016, 0xaadd9435
-0, 144000, 38016, 0x94df6e5e
-0, 147600, 38016, 0x18805412
-0, 151200, 38016, 0x0ba26c8c
-0, 154800, 38016, 0x4548a5c1
-0, 158400, 38016, 0x9217cb5f
-0, 162000, 38016, 0x2ea74a9e
-0, 165600, 38016, 0xeb0c57b6
-0, 169200, 38016, 0xf968a4a5
-0, 172800, 38016, 0xa410ef43
-0, 176400, 38016, 0x55813001
-0, 180000, 38016, 0x9cea4512
-0, 183600, 38016, 0x27754fa6
-0, 187200, 38016, 0x9824548a
-0, 190800, 38016, 0x7f1047eb
-0, 194400, 38016, 0x75fb2e10
-0, 198000, 38016, 0xe50df970
-0, 201600, 38016, 0x6ed6dfb4
-0, 205200, 38016, 0x8e97ccee
-0, 208800, 38016, 0x7f96c5f0
-0, 212400, 38016, 0x0940c200
-0, 216000, 38016, 0x86b98701
-0, 219600, 38016, 0x977d759a
-0, 223200, 38016, 0xf2b17bff
-0, 226800, 38016, 0xee1496d7
-0, 230400, 38016, 0x6cb1c1b5
-0, 234000, 38016, 0xa6bc0db9
-0, 237600, 38016, 0x902f660d
-0, 241200, 38016, 0x7bf7a434
-0, 244800, 38016, 0x97f9c2a6
-0, 248400, 38016, 0xf8bf9241
-0, 252000, 38016, 0x8639502b
-0, 255600, 38016, 0x82c2537f
-0, 259200, 38016, 0x1141243a
-0, 262800, 38016, 0xcaef5ae5
-0, 266400, 38016, 0xe2c4d308
-0, 270000, 38016, 0x35530a2c
-0, 273600, 38016, 0x22a3b317
-0, 277200, 38016, 0xda988427
-0, 280800, 38016, 0x54616f11
-0, 284400, 38016, 0xc38fc57c
-0, 288000, 38016, 0x7039d019
-0, 291600, 38016, 0x0fd6e6d9
-0, 295200, 38016, 0xc213e48e
-0, 298800, 38016, 0xf469b8e1
-0, 302400, 38016, 0x1f5c706c
-0, 306000, 38016, 0x69652db3
-0, 309600, 38016, 0xe1b9d46d
-0, 313200, 38016, 0x4e7522aa
-0, 316800, 38016, 0x8f4025a4
-0, 320400, 38016, 0xbc0483f6
-0, 324000, 38016, 0xae91d342
-0, 327600, 38016, 0xb1435578
-0, 331200, 38016, 0xf7535863
-0, 334800, 38016, 0xc16ff613
-0, 338400, 38016, 0x55bc394f
-0, 342000, 38016, 0xc7b76458
-0, 345600, 38016, 0xd3fd69ae
-0, 349200, 38016, 0x4b44d724
-0, 352800, 38016, 0x740b99c5
-0, 356400, 38016, 0x40c7c625
-0, 360000, 38016, 0x1691a7ef
-0, 363600, 38016, 0x6ea9392e
-0, 367200, 38016, 0xf958200f
-0, 370800, 38016, 0x916d75eb
-0, 374400, 38016, 0x6b4bee69
-0, 378000, 38016, 0x87adf9de
-0, 381600, 38016, 0x92dc586e
-0, 385200, 38016, 0x3c5aa531
-0, 388800, 38016, 0x00f81488
-0, 392400, 38016, 0x981aeb9f
-0, 396000, 38016, 0x49cf8e5f
-0, 399600, 38016, 0xfd56b231
-0, 403200, 38016, 0x419aaa2e
-0, 406800, 38016, 0xae155602
-0, 410400, 38016, 0x1e530aa1
-0, 414000, 38016, 0x60ca2c1b
-0, 417600, 38016, 0x0e7bdec7
-0, 421200, 38016, 0xe858b864
-0, 424800, 38016, 0x47378c1d
-0, 428400, 38016, 0x90008a4d
-0, 432000, 38016, 0xa1293af0
-0, 435600, 38016, 0x596964a8
-0, 439200, 38016, 0xb25d9ccf
-0, 442800, 38016, 0xccdbb7a0
-0, 446400, 38016, 0x3becf25a
-0, 450000, 38016, 0x918d1816
-0, 453600, 38016, 0x71d02564
-0, 457200, 38016, 0x643015fd
-0, 460800, 38016, 0x3af5f577
-0, 464400, 38016, 0x77b5ecea
-0, 468000, 38016, 0x7f940014
-0, 471600, 38016, 0x726f0bf3
-0, 475200, 38016, 0xb728078f
-0, 478800, 38016, 0x46e1f70a
-0, 482400, 38016, 0x79ccdd3e
-0, 486000, 38016, 0x80d2ca75
-0, 489600, 38016, 0xc87dc034
-0, 493200, 38016, 0x7535c12a
-0, 496800, 38016, 0x2d32bd77
-0, 500400, 38016, 0x2fceb360
-0, 504000, 38016, 0x8d0aa592
-0, 507600, 38016, 0xc9b9bb80
-0, 511200, 38016, 0xa667dd9c
-0, 514800, 38016, 0x7b5df35b
-0, 518400, 38016, 0x5feb1125
-0, 522000, 38016, 0x222a306f
-0, 525600, 38016, 0x64c84c75
-0, 529200, 38016, 0x5e605c79
-0, 532800, 38016, 0x2d2f78f3
-0, 536400, 38016, 0x7b72973d
+#tb 0: 1/25
+0,          0,          0,        1,    38016, 0x06150e88
+0,          1,          1,        1,    38016, 0x32d90103
+0,          2,          2,        1,    38016, 0x5b5f2fae
+0,          3,          3,        1,    38016, 0xba6e6302
+0,          4,          4,        1,    38016, 0x6c4b8e95
+0,          5,          5,        1,    38016, 0x6d51ab43
+0,          6,          6,        1,    38016, 0x5582a7c5
+0,          7,          7,        1,    38016, 0xf48e6545
+0,          8,          8,        1,    38016, 0x083a8481
+0,          9,          9,        1,    38016, 0x0576a254
+0,         10,         10,        1,    38016, 0x07429a61
+0,         11,         11,        1,    38016, 0xd1e26eb1
+0,         12,         12,        1,    38016, 0x94032564
+0,         13,         13,        1,    38016, 0xc9d217c0
+0,         14,         14,        1,    38016, 0xf0ee3f46
+0,         15,         15,        1,    38016, 0xe8fc4d97
+0,         16,         16,        1,    38016, 0xd3b0488d
+0,         17,         17,        1,    38016, 0xc4243d99
+0,         18,         18,        1,    38016, 0xa65b36ed
+0,         19,         19,        1,    38016, 0x84ca1844
+0,         20,         20,        1,    38016, 0xcd6706bf
+0,         21,         21,        1,    38016, 0x1c03ec0a
+0,         22,         22,        1,    38016, 0xf1380127
+0,         23,         23,        1,    38016, 0xa499e0a5
+0,         24,         24,        1,    38016, 0x5fca87ce
+0,         25,         25,        1,    38016, 0x0b385064
+0,         26,         26,        1,    38016, 0x6a4f49c4
+0,         27,         27,        1,    38016, 0x97e0464b
+0,         28,         28,        1,    38016, 0xcbf98750
+0,         29,         29,        1,    38016, 0xa9efe0cd
+0,         30,         30,        1,    38016, 0x9ea7d82e
+0,         31,         31,        1,    38016, 0x28cec5ce
+0,         32,         32,        1,    38016, 0xaec6ac1e
+0,         33,         33,        1,    38016, 0x8cba69b3
+0,         34,         34,        1,    38016, 0x727720c1
+0,         35,         35,        1,    38016, 0xee4f4822
+0,         36,         36,        1,    38016, 0x9d456e11
+0,         37,         37,        1,    38016, 0x14123f91
+0,         38,         38,        1,    38016, 0xf5e1d1a3
+0,         39,         39,        1,    38016, 0xaadd9435
+0,         40,         40,        1,    38016, 0x94df6e5e
+0,         41,         41,        1,    38016, 0x18805412
+0,         42,         42,        1,    38016, 0x0ba26c8c
+0,         43,         43,        1,    38016, 0x4548a5c1
+0,         44,         44,        1,    38016, 0x9217cb5f
+0,         45,         45,        1,    38016, 0x2ea74a9e
+0,         46,         46,        1,    38016, 0xeb0c57b6
+0,         47,         47,        1,    38016, 0xf968a4a5
+0,         48,         48,        1,    38016, 0xa410ef43
+0,         49,         49,        1,    38016, 0x55813001
+0,         50,         50,        1,    38016, 0x9cea4512
+0,         51,         51,        1,    38016, 0x27754fa6
+0,         52,         52,        1,    38016, 0x9824548a
+0,         53,         53,        1,    38016, 0x7f1047eb
+0,         54,         54,        1,    38016, 0x75fb2e10
+0,         55,         55,        1,    38016, 0xe50df970
+0,         56,         56,        1,    38016, 0x6ed6dfb4
+0,         57,         57,        1,    38016, 0x8e97ccee
+0,         58,         58,        1,    38016, 0x7f96c5f0
+0,         59,         59,        1,    38016, 0x0940c200
+0,         60,         60,        1,    38016, 0x86b98701
+0,         61,         61,        1,    38016, 0x977d759a
+0,         62,         62,        1,    38016, 0xf2b17bff
+0,         63,         63,        1,    38016, 0xee1496d7
+0,         64,         64,        1,    38016, 0x6cb1c1b5
+0,         65,         65,        1,    38016, 0xa6bc0db9
+0,         66,         66,        1,    38016, 0x902f660d
+0,         67,         67,        1,    38016, 0x7bf7a434
+0,         68,         68,        1,    38016, 0x97f9c2a6
+0,         69,         69,        1,    38016, 0xf8bf9241
+0,         70,         70,        1,    38016, 0x8639502b
+0,         71,         71,        1,    38016, 0x82c2537f
+0,         72,         72,        1,    38016, 0x1141243a
+0,         73,         73,        1,    38016, 0xcaef5ae5
+0,         74,         74,        1,    38016, 0xe2c4d308
+0,         75,         75,        1,    38016, 0x35530a2c
+0,         76,         76,        1,    38016, 0x22a3b317
+0,         77,         77,        1,    38016, 0xda988427
+0,         78,         78,        1,    38016, 0x54616f11
+0,         79,         79,        1,    38016, 0xc38fc57c
+0,         80,         80,        1,    38016, 0x7039d019
+0,         81,         81,        1,    38016, 0x0fd6e6d9
+0,         82,         82,        1,    38016, 0xc213e48e
+0,         83,         83,        1,    38016, 0xf469b8e1
+0,         84,         84,        1,    38016, 0x1f5c706c
+0,         85,         85,        1,    38016, 0x69652db3
+0,         86,         86,        1,    38016, 0xe1b9d46d
+0,         87,         87,        1,    38016, 0x4e7522aa
+0,         88,         88,        1,    38016, 0x8f4025a4
+0,         89,         89,        1,    38016, 0xbc0483f6
+0,         90,         90,        1,    38016, 0xae91d342
+0,         91,         91,        1,    38016, 0xb1435578
+0,         92,         92,        1,    38016, 0xf7535863
+0,         93,         93,        1,    38016, 0xc16ff613
+0,         94,         94,        1,    38016, 0x55bc394f
+0,         95,         95,        1,    38016, 0xc7b76458
+0,         96,         96,        1,    38016, 0xd3fd69ae
+0,         97,         97,        1,    38016, 0x4b44d724
+0,         98,         98,        1,    38016, 0x740b99c5
+0,         99,         99,        1,    38016, 0x40c7c625
+0,        100,        100,        1,    38016, 0x1691a7ef
+0,        101,        101,        1,    38016, 0x6ea9392e
+0,        102,        102,        1,    38016, 0xf958200f
+0,        103,        103,        1,    38016, 0x916d75eb
+0,        104,        104,        1,    38016, 0x6b4bee69
+0,        105,        105,        1,    38016, 0x87adf9de
+0,        106,        106,        1,    38016, 0x92dc586e
+0,        107,        107,        1,    38016, 0x3c5aa531
+0,        108,        108,        1,    38016, 0x00f81488
+0,        109,        109,        1,    38016, 0x981aeb9f
+0,        110,        110,        1,    38016, 0x49cf8e5f
+0,        111,        111,        1,    38016, 0xfd56b231
+0,        112,        112,        1,    38016, 0x419aaa2e
+0,        113,        113,        1,    38016, 0xae155602
+0,        114,        114,        1,    38016, 0x1e530aa1
+0,        115,        115,        1,    38016, 0x60ca2c1b
+0,        116,        116,        1,    38016, 0x0e7bdec7
+0,        117,        117,        1,    38016, 0xe858b864
+0,        118,        118,        1,    38016, 0x47378c1d
+0,        119,        119,        1,    38016, 0x90008a4d
+0,        120,        120,        1,    38016, 0xa1293af0
+0,        121,        121,        1,    38016, 0x596964a8
+0,        122,        122,        1,    38016, 0xb25d9ccf
+0,        123,        123,        1,    38016, 0xccdbb7a0
+0,        124,        124,        1,    38016, 0x3becf25a
+0,        125,        125,        1,    38016, 0x918d1816
+0,        126,        126,        1,    38016, 0x71d02564
+0,        127,        127,        1,    38016, 0x643015fd
+0,        128,        128,        1,    38016, 0x3af5f577
+0,        129,        129,        1,    38016, 0x77b5ecea
+0,        130,        130,        1,    38016, 0x7f940014
+0,        131,        131,        1,    38016, 0x726f0bf3
+0,        132,        132,        1,    38016, 0xb728078f
+0,        133,        133,        1,    38016, 0x46e1f70a
+0,        134,        134,        1,    38016, 0x79ccdd3e
+0,        135,        135,        1,    38016, 0x80d2ca75
+0,        136,        136,        1,    38016, 0xc87dc034
+0,        137,        137,        1,    38016, 0x7535c12a
+0,        138,        138,        1,    38016, 0x2d32bd77
+0,        139,        139,        1,    38016, 0x2fceb360
+0,        140,        140,        1,    38016, 0x8d0aa592
+0,        141,        141,        1,    38016, 0xc9b9bb80
+0,        142,        142,        1,    38016, 0xa667dd9c
+0,        143,        143,        1,    38016, 0x7b5df35b
+0,        144,        144,        1,    38016, 0x5feb1125
+0,        145,        145,        1,    38016, 0x222a306f
+0,        146,        146,        1,    38016, 0x64c84c75
+0,        147,        147,        1,    38016, 0x5e605c79
+0,        148,        148,        1,    38016, 0x2d2f78f3
+0,        149,        149,        1,    38016, 0x7b72973d