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, 112 insertions, 111 deletions

diff --git a/tests/ref/fate/motionpixels b/tests/ref/fate/motionpixels
index d1a2651141..c875275b89 100644
--- a/tests/ref/fate/motionpixels
+++ b/tests/ref/fate/motionpixels
@@ -1,111 +1,112 @@
-0, 0, 230400, 0xee05b509
-0, 6000, 230400, 0x23b28b24
-0, 12000, 230400, 0x4a4d6007
-0, 18000, 230400, 0xe5550693
-0, 24000, 230400, 0xad4905a3
-0, 30000, 230400, 0xc83b9030
-0, 36000, 230400, 0xbc73a26a
-0, 42000, 230400, 0x7065ff8a
-0, 48000, 230400, 0x65bc7675
-0, 54000, 230400, 0xc245737f
-0, 60000, 230400, 0x77e6c1ed
-0, 66000, 230400, 0x6761d73a
-0, 72000, 230400, 0x6207b8f8
-0, 78000, 230400, 0xa3691862
-0, 84000, 230400, 0x83fbfc24
-0, 90000, 230400, 0xe1c34ef0
-0, 96000, 230400, 0xd7b50e8e
-0, 102001, 230400, 0x5b5e2f29
-0, 108001, 230400, 0xca7825e5
-0, 114001, 230400, 0xb4c7b4a9
-0, 120001, 230400, 0xc35513b5
-0, 126001, 230400, 0x36117834
-0, 132001, 230400, 0x8af035d7
-0, 138001, 230400, 0x25c50a2e
-0, 144001, 230400, 0x52f54107
-0, 150001, 230400, 0xaddca5f9
-0, 156001, 230400, 0x3b1fe64c
-0, 162001, 230400, 0xcd52de15
-0, 168001, 230400, 0xfaa4f7fa
-0, 174001, 230400, 0xce5b3221
-0, 180001, 230400, 0xb2c3d9ba
-0, 186001, 230400, 0xf6ec95e9
-0, 192001, 230400, 0xfa7ebd18
-0, 198001, 230400, 0xb6e50465
-0, 204001, 230400, 0xd48ceee9
-0, 210001, 230400, 0x333605cf
-0, 216001, 230400, 0xe7ccf362
-0, 222001, 230400, 0x39f07b83
-0, 228001, 230400, 0xd6450b2e
-0, 234001, 230400, 0x2029ec12
-0, 240001, 230400, 0x15d7762e
-0, 246001, 230400, 0x0d69506d
-0, 252001, 230400, 0xcf2ef066
-0, 258001, 230400, 0x2c145df0
-0, 264001, 230400, 0x153d7fe7
-0, 270001, 230400, 0x98846aea
-0, 276001, 230400, 0xc0347d4e
-0, 282001, 230400, 0xda7a58a8
-0, 288001, 230400, 0x5724c05e
-0, 294001, 230400, 0x9805237b
-0, 300002, 230400, 0x2f5f0d70
-0, 306002, 230400, 0xb1271014
-0, 312002, 230400, 0x6cb29d9c
-0, 318002, 230400, 0x4f91fdb4
-0, 324002, 230400, 0x274b3f30
-0, 330002, 230400, 0xdfc508e8
-0, 336002, 230400, 0x16e974ef
-0, 342002, 230400, 0x98fae336
-0, 348002, 230400, 0xbf265f84
-0, 354002, 230400, 0x75cf323b
-0, 360002, 230400, 0xdb3481f7
-0, 366002, 230400, 0xb8453df5
-0, 372002, 230400, 0xd4598deb
-0, 378002, 230400, 0x4dc19cf6
-0, 384002, 230400, 0xa8d1b340
-0, 390002, 230400, 0x1f98aa27
-0, 396002, 230400, 0x505c0687
-0, 402002, 230400, 0x86179997
-0, 408002, 230400, 0x7e28cc7d
-0, 414002, 230400, 0x0a81c0bc
-0, 420002, 230400, 0x71cc0c9a
-0, 426002, 230400, 0x8c01340f
-0, 432002, 230400, 0x4afea48a
-0, 438002, 230400, 0x7dc88c26
-0, 444002, 230400, 0x4155fbbb
-0, 450002, 230400, 0xb1ec2d6b
-0, 456002, 230400, 0x6986ee65
-0, 462002, 230400, 0x8ff9a311
-0, 468002, 230400, 0x36c21c52
-0, 474002, 230400, 0xdb0fad2e
-0, 480002, 230400, 0xc7a83c34
-0, 486002, 230400, 0x8bd97389
-0, 492002, 230400, 0x6dd8f0d6
-0, 498002, 230400, 0x228e2076
-0, 504003, 230400, 0x22544f03
-0, 510003, 230400, 0x938084ef
-0, 516003, 230400, 0xb002cd81
-0, 522003, 230400, 0xe58d3339
-0, 528003, 230400, 0x02470a69
-0, 534003, 230400, 0xa5c51328
-0, 540003, 230400, 0x1a6e37ec
-0, 546003, 230400, 0x8f40563c
-0, 552003, 230400, 0x30f9095f
-0, 558003, 230400, 0x6227f0e8
-0, 564003, 230400, 0xdca3596d
-0, 570003, 230400, 0x30938988
-0, 576003, 230400, 0x28bdc666
-0, 582003, 230400, 0x6c534265
-0, 588003, 230400, 0x6ea56d2d
-0, 594003, 230400, 0x125f3808
-0, 600003, 230400, 0x92a41d2f
-0, 606003, 230400, 0xf1cf2410
-0, 612003, 230400, 0x1bea1204
-0, 618003, 230400, 0x817e60f9
-0, 624003, 230400, 0x9f6c720e
-0, 630003, 230400, 0xf1a43a2f
-0, 636003, 230400, 0x5e5e0b7f
-0, 642003, 230400, 0x7f526bcf
-0, 648003, 230400, 0x63a846ed
-0, 654003, 230400, 0x94400af9
-0, 660003, 230400, 0x51f4241e
+#tb 0: 66667/1000000
+0,          0,          0,        1,   230400, 0xee05b509
+0,          1,          1,        1,   230400, 0x23b28b24
+0,          2,          2,        1,   230400, 0x4a4d6007
+0,          3,          3,        1,   230400, 0xe5550693
+0,          4,          4,        1,   230400, 0xad4905a3
+0,          5,          5,        1,   230400, 0xc83b9030
+0,          6,          6,        1,   230400, 0xbc73a26a
+0,          7,          7,        1,   230400, 0x7065ff8a
+0,          8,          8,        1,   230400, 0x65bc7675
+0,          9,          9,        1,   230400, 0xc245737f
+0,         10,         10,        1,   230400, 0x77e6c1ed
+0,         11,         11,        1,   230400, 0x6761d73a
+0,         12,         12,        1,   230400, 0x6207b8f8
+0,         13,         13,        1,   230400, 0xa3691862
+0,         14,         14,        1,   230400, 0x83fbfc24
+0,         15,         15,        1,   230400, 0xe1c34ef0
+0,         16,         16,        1,   230400, 0xd7b50e8e
+0,         17,         17,        1,   230400, 0x5b5e2f29
+0,         18,         18,        1,   230400, 0xca7825e5
+0,         19,         19,        1,   230400, 0xb4c7b4a9
+0,         20,         20,        1,   230400, 0xc35513b5
+0,         21,         21,        1,   230400, 0x36117834
+0,         22,         22,        1,   230400, 0x8af035d7
+0,         23,         23,        1,   230400, 0x25c50a2e
+0,         24,         24,        1,   230400, 0x52f54107
+0,         25,         25,        1,   230400, 0xaddca5f9
+0,         26,         26,        1,   230400, 0x3b1fe64c
+0,         27,         27,        1,   230400, 0xcd52de15
+0,         28,         28,        1,   230400, 0xfaa4f7fa
+0,         29,         29,        1,   230400, 0xce5b3221
+0,         30,         30,        1,   230400, 0xb2c3d9ba
+0,         31,         31,        1,   230400, 0xf6ec95e9
+0,         32,         32,        1,   230400, 0xfa7ebd18
+0,         33,         33,        1,   230400, 0xb6e50465
+0,         34,         34,        1,   230400, 0xd48ceee9
+0,         35,         35,        1,   230400, 0x333605cf
+0,         36,         36,        1,   230400, 0xe7ccf362
+0,         37,         37,        1,   230400, 0x39f07b83
+0,         38,         38,        1,   230400, 0xd6450b2e
+0,         39,         39,        1,   230400, 0x2029ec12
+0,         40,         40,        1,   230400, 0x15d7762e
+0,         41,         41,        1,   230400, 0x0d69506d
+0,         42,         42,        1,   230400, 0xcf2ef066
+0,         43,         43,        1,   230400, 0x2c145df0
+0,         44,         44,        1,   230400, 0x153d7fe7
+0,         45,         45,        1,   230400, 0x98846aea
+0,         46,         46,        1,   230400, 0xc0347d4e
+0,         47,         47,        1,   230400, 0xda7a58a8
+0,         48,         48,        1,   230400, 0x5724c05e
+0,         49,         49,        1,   230400, 0x9805237b
+0,         50,         50,        1,   230400, 0x2f5f0d70
+0,         51,         51,        1,   230400, 0xb1271014
+0,         52,         52,        1,   230400, 0x6cb29d9c
+0,         53,         53,        1,   230400, 0x4f91fdb4
+0,         54,         54,        1,   230400, 0x274b3f30
+0,         55,         55,        1,   230400, 0xdfc508e8
+0,         56,         56,        1,   230400, 0x16e974ef
+0,         57,         57,        1,   230400, 0x98fae336
+0,         58,         58,        1,   230400, 0xbf265f84
+0,         59,         59,        1,   230400, 0x75cf323b
+0,         60,         60,        1,   230400, 0xdb3481f7
+0,         61,         61,        1,   230400, 0xb8453df5
+0,         62,         62,        1,   230400, 0xd4598deb
+0,         63,         63,        1,   230400, 0x4dc19cf6
+0,         64,         64,        1,   230400, 0xa8d1b340
+0,         65,         65,        1,   230400, 0x1f98aa27
+0,         66,         66,        1,   230400, 0x505c0687
+0,         67,         67,        1,   230400, 0x86179997
+0,         68,         68,        1,   230400, 0x7e28cc7d
+0,         69,         69,        1,   230400, 0x0a81c0bc
+0,         70,         70,        1,   230400, 0x71cc0c9a
+0,         71,         71,        1,   230400, 0x8c01340f
+0,         72,         72,        1,   230400, 0x4afea48a
+0,         73,         73,        1,   230400, 0x7dc88c26
+0,         74,         74,        1,   230400, 0x4155fbbb
+0,         75,         75,        1,   230400, 0xb1ec2d6b
+0,         76,         76,        1,   230400, 0x6986ee65
+0,         77,         77,        1,   230400, 0x8ff9a311
+0,         78,         78,        1,   230400, 0x36c21c52
+0,         79,         79,        1,   230400, 0xdb0fad2e
+0,         80,         80,        1,   230400, 0xc7a83c34
+0,         81,         81,        1,   230400, 0x8bd97389
+0,         82,         82,        1,   230400, 0x6dd8f0d6
+0,         83,         83,        1,   230400, 0x228e2076
+0,         84,         84,        1,   230400, 0x22544f03
+0,         85,         85,        1,   230400, 0x938084ef
+0,         86,         86,        1,   230400, 0xb002cd81
+0,         87,         87,        1,   230400, 0xe58d3339
+0,         88,         88,        1,   230400, 0x02470a69
+0,         89,         89,        1,   230400, 0xa5c51328
+0,         90,         90,        1,   230400, 0x1a6e37ec
+0,         91,         91,        1,   230400, 0x8f40563c
+0,         92,         92,        1,   230400, 0x30f9095f
+0,         93,         93,        1,   230400, 0x6227f0e8
+0,         94,         94,        1,   230400, 0xdca3596d
+0,         95,         95,        1,   230400, 0x30938988
+0,         96,         96,        1,   230400, 0x28bdc666
+0,         97,         97,        1,   230400, 0x6c534265
+0,         98,         98,        1,   230400, 0x6ea56d2d
+0,         99,         99,        1,   230400, 0x125f3808
+0,        100,        100,        1,   230400, 0x92a41d2f
+0,        101,        101,        1,   230400, 0xf1cf2410
+0,        102,        102,        1,   230400, 0x1bea1204
+0,        103,        103,        1,   230400, 0x817e60f9
+0,        104,        104,        1,   230400, 0x9f6c720e
+0,        105,        105,        1,   230400, 0xf1a43a2f
+0,        106,        106,        1,   230400, 0x5e5e0b7f
+0,        107,        107,        1,   230400, 0x7f526bcf
+0,        108,        108,        1,   230400, 0x63a846ed
+0,        109,        109,        1,   230400, 0x94400af9
+0,        110,        110,        1,   230400, 0x51f4241e