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-frext-hpcamolq_brcm_b b/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
index 6d2e27a663..00f04fdf61 100644
--- a/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
+++ b/tests/ref/fate/h264-conformance-frext-hpcamolq_brcm_b
@@ -1,100 +1,101 @@
-0, 0, 152064, 0xac83f54f
-0, 3600, 152064, 0x4d673b43
-0, 7200, 152064, 0x9050731f
-0, 10800, 152064, 0x4a0741f3
-0, 14400, 152064, 0xb2371c28
-0, 18000, 152064, 0x42210524
-0, 21600, 152064, 0x385f4be5
-0, 25200, 152064, 0xe44ec27a
-0, 28800, 152064, 0xfc668399
-0, 32400, 152064, 0x903fe200
-0, 36000, 152064, 0x4da1deaa
-0, 39600, 152064, 0x68c956ab
-0, 43200, 152064, 0x9cfad799
-0, 46800, 152064, 0x841ed3cd
-0, 50400, 152064, 0x99e66b48
-0, 54000, 152064, 0xcfa28482
-0, 57600, 152064, 0x72f2c717
-0, 61200, 152064, 0xd1d92c80
-0, 64800, 152064, 0x595063eb
-0, 68400, 152064, 0x87373979
-0, 72000, 152064, 0xfa0e75ac
-0, 75600, 152064, 0x0cef3592
-0, 79200, 152064, 0xecfc9c9a
-0, 82800, 152064, 0x5776ff23
-0, 86400, 152064, 0x83419e37
-0, 90000, 152064, 0x4bb31524
-0, 93600, 152064, 0xad8e1bdc
-0, 97200, 152064, 0x7243b6cb
-0, 100800, 152064, 0xf016cda0
-0, 104400, 152064, 0xa2c1d730
-0, 108000, 152064, 0x7999d704
-0, 111600, 152064, 0x86ad0baf
-0, 115200, 152064, 0x35dafe62
-0, 118800, 152064, 0xcb2f5de2
-0, 122400, 152064, 0x3542eb82
-0, 126000, 152064, 0xa704dd92
-0, 129600, 152064, 0x3e50ed92
-0, 133200, 152064, 0x2fe5428a
-0, 136800, 152064, 0xf05dab9d
-0, 140400, 152064, 0xef40c2a3
-0, 144000, 152064, 0x2df8983f
-0, 147600, 152064, 0x0a205c93
-0, 151200, 152064, 0x505562ea
-0, 154800, 152064, 0x24114860
-0, 158400, 152064, 0x2eecccc1
-0, 162000, 152064, 0xc809105f
-0, 165600, 152064, 0x394ab285
-0, 169200, 152064, 0xfda68f17
-0, 172800, 152064, 0x2fd66a51
-0, 176400, 152064, 0x3abb891a
-0, 180000, 152064, 0x62266682
-0, 183600, 152064, 0x68fb38e9
-0, 187200, 152064, 0xae4b9d9b
-0, 190800, 152064, 0xdaf8e150
-0, 194400, 152064, 0x2fd8bf74
-0, 198000, 152064, 0xd2ad6c38
-0, 201600, 152064, 0x76290574
-0, 205200, 152064, 0xaea6b9be
-0, 208800, 152064, 0xd0d797d7
-0, 212400, 152064, 0x87ad00b2
-0, 216000, 152064, 0xe57d11d0
-0, 219600, 152064, 0x25a5c567
-0, 223200, 152064, 0x477e2202
-0, 226800, 152064, 0xaa0618ca
-0, 230400, 152064, 0xb5d2262b
-0, 234000, 152064, 0xae7c135d
-0, 237600, 152064, 0xddb86a7c
-0, 241200, 152064, 0x59bad3ba
-0, 244800, 152064, 0x0b155178
-0, 248400, 152064, 0xc2f265d9
-0, 252000, 152064, 0xb550e8a8
-0, 255600, 152064, 0x1fef6cbc
-0, 259200, 152064, 0xd3d4e578
-0, 262800, 152064, 0x70d20c0d
-0, 266400, 152064, 0xbb8e95a9
-0, 270000, 152064, 0x2a92cda3
-0, 273600, 152064, 0xc0a5e7e0
-0, 277200, 152064, 0x15b99dab
-0, 280800, 152064, 0x536d44e8
-0, 284400, 152064, 0xe43fb4fa
-0, 288000, 152064, 0xdb0873b0
-0, 291600, 152064, 0xc7901e9b
-0, 295200, 152064, 0x36b69923
-0, 298800, 152064, 0xc6a8ac8d
-0, 302400, 152064, 0xd7e4c595
-0, 306000, 152064, 0x2d64cf38
-0, 309600, 152064, 0x007878b1
-0, 313200, 152064, 0xc9c997d4
-0, 316800, 152064, 0xf9de12de
-0, 320400, 152064, 0x25982d54
-0, 324000, 152064, 0xea5eef7c
-0, 327600, 152064, 0x108aceb2
-0, 331200, 152064, 0x3cbac8c8
-0, 334800, 152064, 0x581ec9e1
-0, 338400, 152064, 0xc898bd7d
-0, 342000, 152064, 0x142a0235
-0, 345600, 152064, 0xf9d0aa7e
-0, 349200, 152064, 0xb9fe0bc4
-0, 352800, 152064, 0x21889912
-0, 356400, 152064, 0x3fb2ab18
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0xac83f54f
+0,          1,          1,        1,   152064, 0x4d673b43
+0,          2,          2,        1,   152064, 0x9050731f
+0,          3,          3,        1,   152064, 0x4a0741f3
+0,          4,          4,        1,   152064, 0xb2371c28
+0,          5,          5,        1,   152064, 0x42210524
+0,          6,          6,        1,   152064, 0x385f4be5
+0,          7,          7,        1,   152064, 0xe44ec27a
+0,          8,          8,        1,   152064, 0xfc668399
+0,          9,          9,        1,   152064, 0x903fe200
+0,         10,         10,        1,   152064, 0x4da1deaa
+0,         11,         11,        1,   152064, 0x68c956ab
+0,         12,         12,        1,   152064, 0x9cfad799
+0,         13,         13,        1,   152064, 0x841ed3cd
+0,         14,         14,        1,   152064, 0x99e66b48
+0,         15,         15,        1,   152064, 0xcfa28482
+0,         16,         16,        1,   152064, 0x72f2c717
+0,         17,         17,        1,   152064, 0xd1d92c80
+0,         18,         18,        1,   152064, 0x595063eb
+0,         19,         19,        1,   152064, 0x87373979
+0,         20,         20,        1,   152064, 0xfa0e75ac
+0,         21,         21,        1,   152064, 0x0cef3592
+0,         22,         22,        1,   152064, 0xecfc9c9a
+0,         23,         23,        1,   152064, 0x5776ff23
+0,         24,         24,        1,   152064, 0x83419e37
+0,         25,         25,        1,   152064, 0x4bb31524
+0,         26,         26,        1,   152064, 0xad8e1bdc
+0,         27,         27,        1,   152064, 0x7243b6cb
+0,         28,         28,        1,   152064, 0xf016cda0
+0,         29,         29,        1,   152064, 0xa2c1d730
+0,         30,         30,        1,   152064, 0x7999d704
+0,         31,         31,        1,   152064, 0x86ad0baf
+0,         32,         32,        1,   152064, 0x35dafe62
+0,         33,         33,        1,   152064, 0xcb2f5de2
+0,         34,         34,        1,   152064, 0x3542eb82
+0,         35,         35,        1,   152064, 0xa704dd92
+0,         36,         36,        1,   152064, 0x3e50ed92
+0,         37,         37,        1,   152064, 0x2fe5428a
+0,         38,         38,        1,   152064, 0xf05dab9d
+0,         39,         39,        1,   152064, 0xef40c2a3
+0,         40,         40,        1,   152064, 0x2df8983f
+0,         41,         41,        1,   152064, 0x0a205c93
+0,         42,         42,        1,   152064, 0x505562ea
+0,         43,         43,        1,   152064, 0x24114860
+0,         44,         44,        1,   152064, 0x2eecccc1
+0,         45,         45,        1,   152064, 0xc809105f
+0,         46,         46,        1,   152064, 0x394ab285
+0,         47,         47,        1,   152064, 0xfda68f17
+0,         48,         48,        1,   152064, 0x2fd66a51
+0,         49,         49,        1,   152064, 0x3abb891a
+0,         50,         50,        1,   152064, 0x62266682
+0,         51,         51,        1,   152064, 0x68fb38e9
+0,         52,         52,        1,   152064, 0xae4b9d9b
+0,         53,         53,        1,   152064, 0xdaf8e150
+0,         54,         54,        1,   152064, 0x2fd8bf74
+0,         55,         55,        1,   152064, 0xd2ad6c38
+0,         56,         56,        1,   152064, 0x76290574
+0,         57,         57,        1,   152064, 0xaea6b9be
+0,         58,         58,        1,   152064, 0xd0d797d7
+0,         59,         59,        1,   152064, 0x87ad00b2
+0,         60,         60,        1,   152064, 0xe57d11d0
+0,         61,         61,        1,   152064, 0x25a5c567
+0,         62,         62,        1,   152064, 0x477e2202
+0,         63,         63,        1,   152064, 0xaa0618ca
+0,         64,         64,        1,   152064, 0xb5d2262b
+0,         65,         65,        1,   152064, 0xae7c135d
+0,         66,         66,        1,   152064, 0xddb86a7c
+0,         67,         67,        1,   152064, 0x59bad3ba
+0,         68,         68,        1,   152064, 0x0b155178
+0,         69,         69,        1,   152064, 0xc2f265d9
+0,         70,         70,        1,   152064, 0xb550e8a8
+0,         71,         71,        1,   152064, 0x1fef6cbc
+0,         72,         72,        1,   152064, 0xd3d4e578
+0,         73,         73,        1,   152064, 0x70d20c0d
+0,         74,         74,        1,   152064, 0xbb8e95a9
+0,         75,         75,        1,   152064, 0x2a92cda3
+0,         76,         76,        1,   152064, 0xc0a5e7e0
+0,         77,         77,        1,   152064, 0x15b99dab
+0,         78,         78,        1,   152064, 0x536d44e8
+0,         79,         79,        1,   152064, 0xe43fb4fa
+0,         80,         80,        1,   152064, 0xdb0873b0
+0,         81,         81,        1,   152064, 0xc7901e9b
+0,         82,         82,        1,   152064, 0x36b69923
+0,         83,         83,        1,   152064, 0xc6a8ac8d
+0,         84,         84,        1,   152064, 0xd7e4c595
+0,         85,         85,        1,   152064, 0x2d64cf38
+0,         86,         86,        1,   152064, 0x007878b1
+0,         87,         87,        1,   152064, 0xc9c997d4
+0,         88,         88,        1,   152064, 0xf9de12de
+0,         89,         89,        1,   152064, 0x25982d54
+0,         90,         90,        1,   152064, 0xea5eef7c
+0,         91,         91,        1,   152064, 0x108aceb2
+0,         92,         92,        1,   152064, 0x3cbac8c8
+0,         93,         93,        1,   152064, 0x581ec9e1
+0,         94,         94,        1,   152064, 0xc898bd7d
+0,         95,         95,        1,   152064, 0x142a0235
+0,         96,         96,        1,   152064, 0xf9d0aa7e
+0,         97,         97,        1,   152064, 0xb9fe0bc4
+0,         98,         98,        1,   152064, 0x21889912
+0,         99,         99,        1,   152064, 0x3fb2ab18