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, 101 insertions, 100 deletions

diff --git a/tests/ref/fate/h264-conformance-nrf_mw_e b/tests/ref/fate/h264-conformance-nrf_mw_e
index 425ee75df4..ee5f7193a0 100644
--- a/tests/ref/fate/h264-conformance-nrf_mw_e
+++ b/tests/ref/fate/h264-conformance-nrf_mw_e
@@ -1,100 +1,101 @@
-0, 0, 38016, 0x3ae838ee
-0, 3600, 38016, 0x9ed7e141
-0, 7200, 38016, 0x354e83ed
-0, 10800, 38016, 0x96754ff4
-0, 14400, 38016, 0x2a013a3c
-0, 18000, 38016, 0x57ab4cf2
-0, 21600, 38016, 0x55037493
-0, 25200, 38016, 0x910b8920
-0, 28800, 38016, 0x457785a1
-0, 32400, 38016, 0x9d6864ad
-0, 36000, 38016, 0xe80131ce
-0, 39600, 38016, 0x4cd7f487
-0, 43200, 38016, 0x030df59a
-0, 46800, 38016, 0x6ea60426
-0, 50400, 38016, 0x35311f71
-0, 54000, 38016, 0x731450d8
-0, 57600, 38016, 0x29368c47
-0, 61200, 38016, 0x006292b0
-0, 64800, 38016, 0x961493b1
-0, 68400, 38016, 0xb2e99a07
-0, 72000, 38016, 0xa52f98be
-0, 75600, 38016, 0x8c0a8f70
-0, 79200, 38016, 0xdc5b992c
-0, 82800, 38016, 0xa4a49787
-0, 86400, 38016, 0x7a959608
-0, 90000, 38016, 0xc9619c0a
-0, 93600, 38016, 0xb5519a7e
-0, 97200, 38016, 0x05ea9d9b
-0, 100800, 38016, 0xf73fac90
-0, 104400, 38016, 0x0cd4b3d8
-0, 108000, 38016, 0xb3119df6
-0, 111600, 38016, 0xb8db5d78
-0, 115200, 38016, 0xfb633ee0
-0, 118800, 38016, 0xed1c8935
-0, 122400, 38016, 0x421fedd1
-0, 126000, 38016, 0xa4b84473
-0, 129600, 38016, 0x25598f81
-0, 133200, 38016, 0x92de1dd7
-0, 136800, 38016, 0x776b68c5
-0, 140400, 38016, 0x07b49a7a
-0, 144000, 38016, 0x883ccd79
-0, 147600, 38016, 0xb351e0fc
-0, 151200, 38016, 0x5577d53b
-0, 154800, 38016, 0xffd9ef7d
-0, 158400, 38016, 0x38c1fc8b
-0, 162000, 38016, 0xb9abf3e6
-0, 165600, 38016, 0x2191b0d6
-0, 169200, 38016, 0x313397a3
-0, 172800, 38016, 0x96bca02a
-0, 176400, 38016, 0xd39ac859
-0, 180000, 38016, 0xfb31e18f
-0, 183600, 38016, 0xe182b468
-0, 187200, 38016, 0x8af7dfd6
-0, 190800, 38016, 0x7c19fd4f
-0, 194400, 38016, 0xa8373bae
-0, 198000, 38016, 0x91055016
-0, 201600, 38016, 0x432b5d52
-0, 205200, 38016, 0x81301b3f
-0, 208800, 38016, 0x0d6c2367
-0, 212400, 38016, 0xf0023ac2
-0, 216000, 38016, 0xb9f33791
-0, 219600, 38016, 0xdab62201
-0, 223200, 38016, 0xfab7cfdd
-0, 226800, 38016, 0xfbb2a78f
-0, 230400, 38016, 0xe317c687
-0, 234000, 38016, 0xe4f5d939
-0, 237600, 38016, 0x022dda5b
-0, 241200, 38016, 0x8b5cdf2c
-0, 244800, 38016, 0x3dfec699
-0, 248400, 38016, 0x9484a75c
-0, 252000, 38016, 0x763a911b
-0, 255600, 38016, 0xb1fb7cc8
-0, 259200, 38016, 0x56bf7f7b
-0, 262800, 38016, 0x87567e3e
-0, 266400, 38016, 0x1aa1209e
-0, 270000, 38016, 0xe2b0da25
-0, 273600, 38016, 0xd250c706
-0, 277200, 38016, 0xbea1be9d
-0, 280800, 38016, 0x02f0e6fb
-0, 284400, 38016, 0xd18d382b
-0, 288000, 38016, 0xd0fa57f3
-0, 291600, 38016, 0x873b43e3
-0, 295200, 38016, 0x75b33855
-0, 298800, 38016, 0xcabbe932
-0, 302400, 38016, 0xeded9c0f
-0, 306000, 38016, 0x86b0b9ec
-0, 309600, 38016, 0xb461e10d
-0, 313200, 38016, 0x6702dbbe
-0, 316800, 38016, 0xb3e47c8c
-0, 320400, 38016, 0xd71333ee
-0, 324000, 38016, 0x15c3f15d
-0, 327600, 38016, 0xa7e6bb4e
-0, 331200, 38016, 0x5d5bd15b
-0, 334800, 38016, 0x2476f6b0
-0, 338400, 38016, 0xbee21b05
-0, 342000, 38016, 0x8172d7b9
-0, 345600, 38016, 0x4893b4b2
-0, 349200, 38016, 0xfda7ed23
-0, 352800, 38016, 0xc1ff4cb4
-0, 356400, 38016, 0x9fdc8cc4
+#tb 0: 1/25
+0,          0,          0,        1,    38016, 0x3ae838ee
+0,          1,          1,        1,    38016, 0x9ed7e141
+0,          2,          2,        1,    38016, 0x354e83ed
+0,          3,          3,        1,    38016, 0x96754ff4
+0,          4,          4,        1,    38016, 0x2a013a3c
+0,          5,          5,        1,    38016, 0x57ab4cf2
+0,          6,          6,        1,    38016, 0x55037493
+0,          7,          7,        1,    38016, 0x910b8920
+0,          8,          8,        1,    38016, 0x457785a1
+0,          9,          9,        1,    38016, 0x9d6864ad
+0,         10,         10,        1,    38016, 0xe80131ce
+0,         11,         11,        1,    38016, 0x4cd7f487
+0,         12,         12,        1,    38016, 0x030df59a
+0,         13,         13,        1,    38016, 0x6ea60426
+0,         14,         14,        1,    38016, 0x35311f71
+0,         15,         15,        1,    38016, 0x731450d8
+0,         16,         16,        1,    38016, 0x29368c47
+0,         17,         17,        1,    38016, 0x006292b0
+0,         18,         18,        1,    38016, 0x961493b1
+0,         19,         19,        1,    38016, 0xb2e99a07
+0,         20,         20,        1,    38016, 0xa52f98be
+0,         21,         21,        1,    38016, 0x8c0a8f70
+0,         22,         22,        1,    38016, 0xdc5b992c
+0,         23,         23,        1,    38016, 0xa4a49787
+0,         24,         24,        1,    38016, 0x7a959608
+0,         25,         25,        1,    38016, 0xc9619c0a
+0,         26,         26,        1,    38016, 0xb5519a7e
+0,         27,         27,        1,    38016, 0x05ea9d9b
+0,         28,         28,        1,    38016, 0xf73fac90
+0,         29,         29,        1,    38016, 0x0cd4b3d8
+0,         30,         30,        1,    38016, 0xb3119df6
+0,         31,         31,        1,    38016, 0xb8db5d78
+0,         32,         32,        1,    38016, 0xfb633ee0
+0,         33,         33,        1,    38016, 0xed1c8935
+0,         34,         34,        1,    38016, 0x421fedd1
+0,         35,         35,        1,    38016, 0xa4b84473
+0,         36,         36,        1,    38016, 0x25598f81
+0,         37,         37,        1,    38016, 0x92de1dd7
+0,         38,         38,        1,    38016, 0x776b68c5
+0,         39,         39,        1,    38016, 0x07b49a7a
+0,         40,         40,        1,    38016, 0x883ccd79
+0,         41,         41,        1,    38016, 0xb351e0fc
+0,         42,         42,        1,    38016, 0x5577d53b
+0,         43,         43,        1,    38016, 0xffd9ef7d
+0,         44,         44,        1,    38016, 0x38c1fc8b
+0,         45,         45,        1,    38016, 0xb9abf3e6
+0,         46,         46,        1,    38016, 0x2191b0d6
+0,         47,         47,        1,    38016, 0x313397a3
+0,         48,         48,        1,    38016, 0x96bca02a
+0,         49,         49,        1,    38016, 0xd39ac859
+0,         50,         50,        1,    38016, 0xfb31e18f
+0,         51,         51,        1,    38016, 0xe182b468
+0,         52,         52,        1,    38016, 0x8af7dfd6
+0,         53,         53,        1,    38016, 0x7c19fd4f
+0,         54,         54,        1,    38016, 0xa8373bae
+0,         55,         55,        1,    38016, 0x91055016
+0,         56,         56,        1,    38016, 0x432b5d52
+0,         57,         57,        1,    38016, 0x81301b3f
+0,         58,         58,        1,    38016, 0x0d6c2367
+0,         59,         59,        1,    38016, 0xf0023ac2
+0,         60,         60,        1,    38016, 0xb9f33791
+0,         61,         61,        1,    38016, 0xdab62201
+0,         62,         62,        1,    38016, 0xfab7cfdd
+0,         63,         63,        1,    38016, 0xfbb2a78f
+0,         64,         64,        1,    38016, 0xe317c687
+0,         65,         65,        1,    38016, 0xe4f5d939
+0,         66,         66,        1,    38016, 0x022dda5b
+0,         67,         67,        1,    38016, 0x8b5cdf2c
+0,         68,         68,        1,    38016, 0x3dfec699
+0,         69,         69,        1,    38016, 0x9484a75c
+0,         70,         70,        1,    38016, 0x763a911b
+0,         71,         71,        1,    38016, 0xb1fb7cc8
+0,         72,         72,        1,    38016, 0x56bf7f7b
+0,         73,         73,        1,    38016, 0x87567e3e
+0,         74,         74,        1,    38016, 0x1aa1209e
+0,         75,         75,        1,    38016, 0xe2b0da25
+0,         76,         76,        1,    38016, 0xd250c706
+0,         77,         77,        1,    38016, 0xbea1be9d
+0,         78,         78,        1,    38016, 0x02f0e6fb
+0,         79,         79,        1,    38016, 0xd18d382b
+0,         80,         80,        1,    38016, 0xd0fa57f3
+0,         81,         81,        1,    38016, 0x873b43e3
+0,         82,         82,        1,    38016, 0x75b33855
+0,         83,         83,        1,    38016, 0xcabbe932
+0,         84,         84,        1,    38016, 0xeded9c0f
+0,         85,         85,        1,    38016, 0x86b0b9ec
+0,         86,         86,        1,    38016, 0xb461e10d
+0,         87,         87,        1,    38016, 0x6702dbbe
+0,         88,         88,        1,    38016, 0xb3e47c8c
+0,         89,         89,        1,    38016, 0xd71333ee
+0,         90,         90,        1,    38016, 0x15c3f15d
+0,         91,         91,        1,    38016, 0xa7e6bb4e
+0,         92,         92,        1,    38016, 0x5d5bd15b
+0,         93,         93,        1,    38016, 0x2476f6b0
+0,         94,         94,        1,    38016, 0xbee21b05
+0,         95,         95,        1,    38016, 0x8172d7b9
+0,         96,         96,        1,    38016, 0x4893b4b2
+0,         97,         97,        1,    38016, 0xfda7ed23
+0,         98,         98,        1,    38016, 0xc1ff4cb4
+0,         99,         99,        1,    38016, 0x9fdc8cc4