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, 91 insertions, 90 deletions

diff --git a/tests/ref/fate/h264-conformance-camanl1_toshiba_b b/tests/ref/fate/h264-conformance-camanl1_toshiba_b
index 07422b8d20..2c3c557071 100644
--- a/tests/ref/fate/h264-conformance-camanl1_toshiba_b
+++ b/tests/ref/fate/h264-conformance-camanl1_toshiba_b
@@ -1,90 +1,91 @@
-0, 0, 152064, 0xb1edd842
-0, 3600, 152064, 0x551f8f45
-0, 7200, 152064, 0xb4931cb2
-0, 10800, 152064, 0x78882b27
-0, 14400, 152064, 0x3afef36d
-0, 18000, 152064, 0x85afad0a
-0, 21600, 152064, 0x3a8bab81
-0, 25200, 152064, 0x2a437174
-0, 28800, 152064, 0x22421437
-0, 32400, 152064, 0x39c5f125
-0, 36000, 152064, 0x256eaad2
-0, 39600, 152064, 0x668a5d31
-0, 43200, 152064, 0x412a4aa7
-0, 46800, 152064, 0x3f091baf
-0, 50400, 152064, 0xbf16d262
-0, 54000, 152064, 0x2fc4ce67
-0, 57600, 152064, 0x119cde3e
-0, 61200, 152064, 0xb40b8632
-0, 64800, 152064, 0x4be4f192
-0, 68400, 152064, 0x906c1237
-0, 72000, 152064, 0x95380024
-0, 75600, 152064, 0x6a833025
-0, 79200, 152064, 0x681d1c4f
-0, 82800, 152064, 0x08c8dea4
-0, 86400, 152064, 0xc69226f0
-0, 90000, 152064, 0x86631102
-0, 93600, 152064, 0x7f40c77a
-0, 97200, 152064, 0xc746ddd4
-0, 100800, 152064, 0x5f2bd3cb
-0, 104400, 152064, 0x643c8316
-0, 108000, 152064, 0x5b7fa380
-0, 111600, 152064, 0x82438cf7
-0, 115200, 152064, 0xdee0f7e7
-0, 118800, 152064, 0xc50d41f1
-0, 122400, 152064, 0xf3453631
-0, 126000, 152064, 0x90bce66b
-0, 129600, 152064, 0x045b03f7
-0, 133200, 152064, 0xf64bd756
-0, 136800, 152064, 0xff997ef2
-0, 140400, 152064, 0x3613a0a5
-0, 144000, 152064, 0xe6a7a8d6
-0, 147600, 152064, 0xb0906c42
-0, 151200, 152064, 0x4dfc912b
-0, 154800, 152064, 0x81e3991c
-0, 158400, 152064, 0x4efc61fb
-0, 162000, 152064, 0xed478395
-0, 165600, 152064, 0x4cb25ab6
-0, 169200, 152064, 0x28e7d51f
-0, 172800, 152064, 0x8bcc1a8d
-0, 176400, 152064, 0x2fe1f240
-0, 180000, 152064, 0xb4978ef8
-0, 183600, 152064, 0xe3929556
-0, 187200, 152064, 0xd370632a
-0, 190800, 152064, 0xba86ffb2
-0, 194400, 152064, 0x444bf18c
-0, 198000, 152064, 0xab40bd14
-0, 201600, 152064, 0xfd488a5d
-0, 205200, 152064, 0xe1f09568
-0, 208800, 152064, 0x09ee7a7e
-0, 212400, 152064, 0x9360397c
-0, 216000, 152064, 0xdbd467e9
-0, 219600, 152064, 0x99726777
-0, 223200, 152064, 0x009fd46c
-0, 226800, 152064, 0xcf770fdb
-0, 230400, 152064, 0x2a890fd9
-0, 234000, 152064, 0x7f40de4b
-0, 237600, 152064, 0x04191304
-0, 241200, 152064, 0x15722022
-0, 244800, 152064, 0x59f4ea93
-0, 248400, 152064, 0x28ba373f
-0, 252000, 152064, 0xf9e400b8
-0, 255600, 152064, 0x85c4bd98
-0, 259200, 152064, 0x6917d2a5
-0, 262800, 152064, 0x61cae234
-0, 266400, 152064, 0x752a9a2d
-0, 270000, 152064, 0x1ee2d9bd
-0, 273600, 152064, 0xdce9ab8e
-0, 277200, 152064, 0x51225fd0
-0, 280800, 152064, 0x10e8cb60
-0, 284400, 152064, 0x8d07cd25
-0, 288000, 152064, 0xb18ba61b
-0, 291600, 152064, 0xb0f10280
-0, 295200, 152064, 0x76a71f13
-0, 298800, 152064, 0x3004f5a1
-0, 302400, 152064, 0x9aba5724
-0, 306000, 152064, 0x5db85385
-0, 309600, 152064, 0xbe9d3f5b
-0, 313200, 152064, 0xa71e85bb
-0, 316800, 152064, 0xdcf59cd7
-0, 320400, 152064, 0x5e319459
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0xb1edd842
+0,          1,          1,        1,   152064, 0x551f8f45
+0,          2,          2,        1,   152064, 0xb4931cb2
+0,          3,          3,        1,   152064, 0x78882b27
+0,          4,          4,        1,   152064, 0x3afef36d
+0,          5,          5,        1,   152064, 0x85afad0a
+0,          6,          6,        1,   152064, 0x3a8bab81
+0,          7,          7,        1,   152064, 0x2a437174
+0,          8,          8,        1,   152064, 0x22421437
+0,          9,          9,        1,   152064, 0x39c5f125
+0,         10,         10,        1,   152064, 0x256eaad2
+0,         11,         11,        1,   152064, 0x668a5d31
+0,         12,         12,        1,   152064, 0x412a4aa7
+0,         13,         13,        1,   152064, 0x3f091baf
+0,         14,         14,        1,   152064, 0xbf16d262
+0,         15,         15,        1,   152064, 0x2fc4ce67
+0,         16,         16,        1,   152064, 0x119cde3e
+0,         17,         17,        1,   152064, 0xb40b8632
+0,         18,         18,        1,   152064, 0x4be4f192
+0,         19,         19,        1,   152064, 0x906c1237
+0,         20,         20,        1,   152064, 0x95380024
+0,         21,         21,        1,   152064, 0x6a833025
+0,         22,         22,        1,   152064, 0x681d1c4f
+0,         23,         23,        1,   152064, 0x08c8dea4
+0,         24,         24,        1,   152064, 0xc69226f0
+0,         25,         25,        1,   152064, 0x86631102
+0,         26,         26,        1,   152064, 0x7f40c77a
+0,         27,         27,        1,   152064, 0xc746ddd4
+0,         28,         28,        1,   152064, 0x5f2bd3cb
+0,         29,         29,        1,   152064, 0x643c8316
+0,         30,         30,        1,   152064, 0x5b7fa380
+0,         31,         31,        1,   152064, 0x82438cf7
+0,         32,         32,        1,   152064, 0xdee0f7e7
+0,         33,         33,        1,   152064, 0xc50d41f1
+0,         34,         34,        1,   152064, 0xf3453631
+0,         35,         35,        1,   152064, 0x90bce66b
+0,         36,         36,        1,   152064, 0x045b03f7
+0,         37,         37,        1,   152064, 0xf64bd756
+0,         38,         38,        1,   152064, 0xff997ef2
+0,         39,         39,        1,   152064, 0x3613a0a5
+0,         40,         40,        1,   152064, 0xe6a7a8d6
+0,         41,         41,        1,   152064, 0xb0906c42
+0,         42,         42,        1,   152064, 0x4dfc912b
+0,         43,         43,        1,   152064, 0x81e3991c
+0,         44,         44,        1,   152064, 0x4efc61fb
+0,         45,         45,        1,   152064, 0xed478395
+0,         46,         46,        1,   152064, 0x4cb25ab6
+0,         47,         47,        1,   152064, 0x28e7d51f
+0,         48,         48,        1,   152064, 0x8bcc1a8d
+0,         49,         49,        1,   152064, 0x2fe1f240
+0,         50,         50,        1,   152064, 0xb4978ef8
+0,         51,         51,        1,   152064, 0xe3929556
+0,         52,         52,        1,   152064, 0xd370632a
+0,         53,         53,        1,   152064, 0xba86ffb2
+0,         54,         54,        1,   152064, 0x444bf18c
+0,         55,         55,        1,   152064, 0xab40bd14
+0,         56,         56,        1,   152064, 0xfd488a5d
+0,         57,         57,        1,   152064, 0xe1f09568
+0,         58,         58,        1,   152064, 0x09ee7a7e
+0,         59,         59,        1,   152064, 0x9360397c
+0,         60,         60,        1,   152064, 0xdbd467e9
+0,         61,         61,        1,   152064, 0x99726777
+0,         62,         62,        1,   152064, 0x009fd46c
+0,         63,         63,        1,   152064, 0xcf770fdb
+0,         64,         64,        1,   152064, 0x2a890fd9
+0,         65,         65,        1,   152064, 0x7f40de4b
+0,         66,         66,        1,   152064, 0x04191304
+0,         67,         67,        1,   152064, 0x15722022
+0,         68,         68,        1,   152064, 0x59f4ea93
+0,         69,         69,        1,   152064, 0x28ba373f
+0,         70,         70,        1,   152064, 0xf9e400b8
+0,         71,         71,        1,   152064, 0x85c4bd98
+0,         72,         72,        1,   152064, 0x6917d2a5
+0,         73,         73,        1,   152064, 0x61cae234
+0,         74,         74,        1,   152064, 0x752a9a2d
+0,         75,         75,        1,   152064, 0x1ee2d9bd
+0,         76,         76,        1,   152064, 0xdce9ab8e
+0,         77,         77,        1,   152064, 0x51225fd0
+0,         78,         78,        1,   152064, 0x10e8cb60
+0,         79,         79,        1,   152064, 0x8d07cd25
+0,         80,         80,        1,   152064, 0xb18ba61b
+0,         81,         81,        1,   152064, 0xb0f10280
+0,         82,         82,        1,   152064, 0x76a71f13
+0,         83,         83,        1,   152064, 0x3004f5a1
+0,         84,         84,        1,   152064, 0x9aba5724
+0,         85,         85,        1,   152064, 0x5db85385
+0,         86,         86,        1,   152064, 0xbe9d3f5b
+0,         87,         87,        1,   152064, 0xa71e85bb
+0,         88,         88,        1,   152064, 0xdcf59cd7
+0,         89,         89,        1,   152064, 0x5e319459