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-freh7_b b/tests/ref/fate/h264-conformance-frext-freh7_b
index 8c397f2dd5..519c34676e 100644
--- a/tests/ref/fate/h264-conformance-frext-freh7_b
+++ b/tests/ref/fate/h264-conformance-frext-freh7_b
@@ -1,100 +1,101 @@
-0, 0, 152064, 0x89f2e8d5
-0, 3600, 152064, 0x35b99397
-0, 7200, 152064, 0x6ef46744
-0, 10800, 152064, 0xec4d6c1c
-0, 14400, 152064, 0xad6e0c70
-0, 18000, 152064, 0x2db534b3
-0, 21600, 152064, 0xcbd25ddd
-0, 25200, 152064, 0xd90708b4
-0, 28800, 152064, 0xc2aa52df
-0, 32400, 152064, 0xbcfc84dc
-0, 36000, 152064, 0xa5a6d269
-0, 39600, 152064, 0x27220ce9
-0, 43200, 152064, 0xf075ee6d
-0, 46800, 152064, 0x9fd3c2ac
-0, 50400, 152064, 0xcba24c2d
-0, 54000, 152064, 0x41cd9441
-0, 57600, 152064, 0x0126efa3
-0, 61200, 152064, 0xf62112af
-0, 64800, 152064, 0x35aff50f
-0, 68400, 152064, 0xcb0b276f
-0, 72000, 152064, 0xc7ef0214
-0, 75600, 152064, 0x7f78d387
-0, 79200, 152064, 0x266c673d
-0, 82800, 152064, 0x1d39c073
-0, 86400, 152064, 0x6a3ae455
-0, 90000, 152064, 0xe4ce0230
-0, 93600, 152064, 0x7f95e87b
-0, 97200, 152064, 0x7c552236
-0, 100800, 152064, 0x24c799b9
-0, 104400, 152064, 0x5042d974
-0, 108000, 152064, 0xe934a5b8
-0, 111600, 152064, 0x6d59c884
-0, 115200, 152064, 0xd00f7fdb
-0, 118800, 152064, 0x62ac3ebd
-0, 122400, 152064, 0xb40a6c25
-0, 126000, 152064, 0x8706188c
-0, 129600, 152064, 0x7682e339
-0, 133200, 152064, 0x1061d943
-0, 136800, 152064, 0x50fa684a
-0, 140400, 152064, 0xab4b1975
-0, 144000, 152064, 0x2d043acb
-0, 147600, 152064, 0xe3c2ec0a
-0, 151200, 152064, 0xb9bc99dc
-0, 154800, 152064, 0x051fb857
-0, 158400, 152064, 0x71d1fe52
-0, 162000, 152064, 0x4230c694
-0, 165600, 152064, 0xb412a137
-0, 169200, 152064, 0x2f50f90d
-0, 172800, 152064, 0x68a1466f
-0, 176400, 152064, 0x77e3f47b
-0, 180000, 152064, 0x4d08de2b
-0, 183600, 152064, 0x1fc663be
-0, 187200, 152064, 0x2c8ba712
-0, 190800, 152064, 0xd50d85b9
-0, 194400, 152064, 0xe8483437
-0, 198000, 152064, 0x4e331e4c
-0, 201600, 152064, 0x0f64a7a0
-0, 205200, 152064, 0x797b0b8c
-0, 208800, 152064, 0x1b91e6d8
-0, 212400, 152064, 0xf3a1f3b6
-0, 216000, 152064, 0x2b94bd52
-0, 219600, 152064, 0x1f30962e
-0, 223200, 152064, 0x853321cf
-0, 226800, 152064, 0x8266c0ac
-0, 230400, 152064, 0x25498be0
-0, 234000, 152064, 0x0f653af9
-0, 237600, 152064, 0x0a025f7e
-0, 241200, 152064, 0x1cfbae04
-0, 244800, 152064, 0x3a874757
-0, 248400, 152064, 0x2c67006e
-0, 252000, 152064, 0x1d409bce
-0, 255600, 152064, 0xfe43121f
-0, 259200, 152064, 0x43411830
-0, 262800, 152064, 0x536d26ca
-0, 266400, 152064, 0x9eb873ea
-0, 270000, 152064, 0x093f93ec
-0, 273600, 152064, 0xdf6f0381
-0, 277200, 152064, 0xa9f4b5e5
-0, 280800, 152064, 0x08f71ef8
-0, 284400, 152064, 0x7a68f820
-0, 288000, 152064, 0xae0c73e7
-0, 291600, 152064, 0x886ae6c7
-0, 295200, 152064, 0x9357f433
-0, 298800, 152064, 0xcc335068
-0, 302400, 152064, 0x2ea108ab
-0, 306000, 152064, 0x06d7dcb0
-0, 309600, 152064, 0x81dc81bc
-0, 313200, 152064, 0xfb32b626
-0, 316800, 152064, 0x2787d1c7
-0, 320400, 152064, 0x69e51118
-0, 324000, 152064, 0xba15d94d
-0, 327600, 152064, 0xc41c09cf
-0, 331200, 152064, 0x7e50e12f
-0, 334800, 152064, 0x0763ddbe
-0, 338400, 152064, 0x8a09bb88
-0, 342000, 152064, 0x530752b7
-0, 345600, 152064, 0x9b159923
-0, 349200, 152064, 0xcbb83ed3
-0, 352800, 152064, 0xdeb5ac0e
-0, 356400, 152064, 0x189299d4
+#tb 0: 1/25
+0,          0,          0,        1,   152064, 0x89f2e8d5
+0,          1,          1,        1,   152064, 0x35b99397
+0,          2,          2,        1,   152064, 0x6ef46744
+0,          3,          3,        1,   152064, 0xec4d6c1c
+0,          4,          4,        1,   152064, 0xad6e0c70
+0,          5,          5,        1,   152064, 0x2db534b3
+0,          6,          6,        1,   152064, 0xcbd25ddd
+0,          7,          7,        1,   152064, 0xd90708b4
+0,          8,          8,        1,   152064, 0xc2aa52df
+0,          9,          9,        1,   152064, 0xbcfc84dc
+0,         10,         10,        1,   152064, 0xa5a6d269
+0,         11,         11,        1,   152064, 0x27220ce9
+0,         12,         12,        1,   152064, 0xf075ee6d
+0,         13,         13,        1,   152064, 0x9fd3c2ac
+0,         14,         14,        1,   152064, 0xcba24c2d
+0,         15,         15,        1,   152064, 0x41cd9441
+0,         16,         16,        1,   152064, 0x0126efa3
+0,         17,         17,        1,   152064, 0xf62112af
+0,         18,         18,        1,   152064, 0x35aff50f
+0,         19,         19,        1,   152064, 0xcb0b276f
+0,         20,         20,        1,   152064, 0xc7ef0214
+0,         21,         21,        1,   152064, 0x7f78d387
+0,         22,         22,        1,   152064, 0x266c673d
+0,         23,         23,        1,   152064, 0x1d39c073
+0,         24,         24,        1,   152064, 0x6a3ae455
+0,         25,         25,        1,   152064, 0xe4ce0230
+0,         26,         26,        1,   152064, 0x7f95e87b
+0,         27,         27,        1,   152064, 0x7c552236
+0,         28,         28,        1,   152064, 0x24c799b9
+0,         29,         29,        1,   152064, 0x5042d974
+0,         30,         30,        1,   152064, 0xe934a5b8
+0,         31,         31,        1,   152064, 0x6d59c884
+0,         32,         32,        1,   152064, 0xd00f7fdb
+0,         33,         33,        1,   152064, 0x62ac3ebd
+0,         34,         34,        1,   152064, 0xb40a6c25
+0,         35,         35,        1,   152064, 0x8706188c
+0,         36,         36,        1,   152064, 0x7682e339
+0,         37,         37,        1,   152064, 0x1061d943
+0,         38,         38,        1,   152064, 0x50fa684a
+0,         39,         39,        1,   152064, 0xab4b1975
+0,         40,         40,        1,   152064, 0x2d043acb
+0,         41,         41,        1,   152064, 0xe3c2ec0a
+0,         42,         42,        1,   152064, 0xb9bc99dc
+0,         43,         43,        1,   152064, 0x051fb857
+0,         44,         44,        1,   152064, 0x71d1fe52
+0,         45,         45,        1,   152064, 0x4230c694
+0,         46,         46,        1,   152064, 0xb412a137
+0,         47,         47,        1,   152064, 0x2f50f90d
+0,         48,         48,        1,   152064, 0x68a1466f
+0,         49,         49,        1,   152064, 0x77e3f47b
+0,         50,         50,        1,   152064, 0x4d08de2b
+0,         51,         51,        1,   152064, 0x1fc663be
+0,         52,         52,        1,   152064, 0x2c8ba712
+0,         53,         53,        1,   152064, 0xd50d85b9
+0,         54,         54,        1,   152064, 0xe8483437
+0,         55,         55,        1,   152064, 0x4e331e4c
+0,         56,         56,        1,   152064, 0x0f64a7a0
+0,         57,         57,        1,   152064, 0x797b0b8c
+0,         58,         58,        1,   152064, 0x1b91e6d8
+0,         59,         59,        1,   152064, 0xf3a1f3b6
+0,         60,         60,        1,   152064, 0x2b94bd52
+0,         61,         61,        1,   152064, 0x1f30962e
+0,         62,         62,        1,   152064, 0x853321cf
+0,         63,         63,        1,   152064, 0x8266c0ac
+0,         64,         64,        1,   152064, 0x25498be0
+0,         65,         65,        1,   152064, 0x0f653af9
+0,         66,         66,        1,   152064, 0x0a025f7e
+0,         67,         67,        1,   152064, 0x1cfbae04
+0,         68,         68,        1,   152064, 0x3a874757
+0,         69,         69,        1,   152064, 0x2c67006e
+0,         70,         70,        1,   152064, 0x1d409bce
+0,         71,         71,        1,   152064, 0xfe43121f
+0,         72,         72,        1,   152064, 0x43411830
+0,         73,         73,        1,   152064, 0x536d26ca
+0,         74,         74,        1,   152064, 0x9eb873ea
+0,         75,         75,        1,   152064, 0x093f93ec
+0,         76,         76,        1,   152064, 0xdf6f0381
+0,         77,         77,        1,   152064, 0xa9f4b5e5
+0,         78,         78,        1,   152064, 0x08f71ef8
+0,         79,         79,        1,   152064, 0x7a68f820
+0,         80,         80,        1,   152064, 0xae0c73e7
+0,         81,         81,        1,   152064, 0x886ae6c7
+0,         82,         82,        1,   152064, 0x9357f433
+0,         83,         83,        1,   152064, 0xcc335068
+0,         84,         84,        1,   152064, 0x2ea108ab
+0,         85,         85,        1,   152064, 0x06d7dcb0
+0,         86,         86,        1,   152064, 0x81dc81bc
+0,         87,         87,        1,   152064, 0xfb32b626
+0,         88,         88,        1,   152064, 0x2787d1c7
+0,         89,         89,        1,   152064, 0x69e51118
+0,         90,         90,        1,   152064, 0xba15d94d
+0,         91,         91,        1,   152064, 0xc41c09cf
+0,         92,         92,        1,   152064, 0x7e50e12f
+0,         93,         93,        1,   152064, 0x0763ddbe
+0,         94,         94,        1,   152064, 0x8a09bb88
+0,         95,         95,        1,   152064, 0x530752b7
+0,         96,         96,        1,   152064, 0x9b159923
+0,         97,         97,        1,   152064, 0xcbb83ed3
+0,         98,         98,        1,   152064, 0xdeb5ac0e
+0,         99,         99,        1,   152064, 0x189299d4