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, 81 insertions, 79 deletions

diff --git a/tests/ref/fate/vqa-cc b/tests/ref/fate/vqa-cc
index fdc7e72eeb..3b00d0dae7 100644
--- a/tests/ref/fate/vqa-cc
+++ b/tests/ref/fate/vqa-cc
@@ -1,79 +1,81 @@
-0, 0, 192000, 0x00000000
-1, 0, 22048, 0x0665d7f4
-0, 6000, 192000, 0x00000000
-0, 12000, 192000, 0x00000000
-0, 18000, 192000, 0x00000000
-0, 24000, 192000, 0x9ee00ccf
-0, 30000, 192000, 0x67256507
-0, 36000, 192000, 0x74c70e87
-0, 42000, 192000, 0x8ecdce9a
-1, 44996, 2940, 0x0f3c64cb
-0, 48000, 192000, 0xc40f8efd
-1, 50996, 2940, 0xc90b9e78
-0, 54000, 192000, 0xb8107dfb
-1, 56996, 2940, 0x146246a3
-0, 60000, 192000, 0xb4e504eb
-1, 62996, 2940, 0xd22c714e
-0, 66000, 192000, 0x0c7fdb95
-1, 68996, 2940, 0xd86b681e
-0, 72000, 192000, 0x58c9f045
-1, 74996, 2940, 0x12ec8186
-0, 78000, 192000, 0xcba9d0e9
-1, 80996, 2940, 0x69aa85b6
-0, 84000, 192000, 0x392a20f6
-1, 86996, 2940, 0xb24d33b0
-0, 90000, 192000, 0xc37905cc
-1, 92996, 2940, 0x3f7b0f0d
-0, 96000, 192000, 0xe278cf95
-1, 98996, 2940, 0x64f10f7e
-0, 102000, 192000, 0x3d03b01d
-1, 104996, 2940, 0xd6ea379a
-0, 108000, 192000, 0x16a26f28
-1, 110996, 2940, 0x7c38e830
-0, 114000, 192000, 0xdd17f51c
-1, 116996, 2940, 0xc28ff132
-0, 120000, 192000, 0x19703b85
-1, 122996, 2940, 0xe7b11629
-0, 126000, 192000, 0xe51f0e70
-1, 128996, 2940, 0xeb86fdcb
-0, 132000, 192000, 0x6f94ad2a
-1, 134996, 2940, 0x5508f586
-0, 138000, 192000, 0x71e449f1
-1, 140996, 2940, 0xf4fa1f1b
-0, 144000, 192000, 0x1dcacc52
-1, 146996, 2940, 0x9e5ff976
-0, 150000, 192000, 0x49c23f58
-1, 152996, 2940, 0xcfc4e08f
-0, 156000, 192000, 0x4ce61551
-1, 158996, 2940, 0x74bde7ed
-0, 162000, 192000, 0xe54832d5
-1, 164996, 2940, 0x3e4ae245
-0, 168000, 192000, 0xbae28a59
-1, 170996, 2940, 0x4c6a8e56
-0, 174000, 192000, 0xe8a4efbe
-1, 176996, 2940, 0xa09d86ab
-0, 180000, 192000, 0xe9e96883
-1, 182996, 2940, 0xc8531912
-0, 186000, 192000, 0xa5468c49
-1, 188996, 2940, 0xa5f266aa
-0, 192000, 192000, 0x7ec6936a
-1, 194996, 2940, 0x587a4187
-0, 198000, 192000, 0x46e53ee4
-1, 200996, 2940, 0x14752d45
-0, 204000, 192000, 0x937b168a
-1, 206996, 2940, 0x558cde10
-0, 210000, 192000, 0xed76cec4
-1, 212996, 2940, 0x735fee38
-0, 216000, 192000, 0x4b9f454d
-1, 218996, 2940, 0xac8bb6c8
-0, 222000, 192000, 0xb58c1566
-1, 224996, 2940, 0xa503c73b
-0, 228000, 192000, 0xb58c1566
-1, 230996, 2940, 0x7cd588a3
-1, 236996, 2940, 0xa6974b04
-1, 242996, 2940, 0xbf448241
-1, 248996, 2940, 0x2a5c2759
-1, 254996, 2940, 0xd0de5ce0
-1, 260996, 2940, 0xc0486649
-1, 266996, 2940, 0x48b040af
-1, 272996, 2940, 0x82a338a9
+#tb 0: 1/15
+#tb 1: 1/22050
+0,          0,          0,        1,   192000, 0x00000000
+1,          0,          0,    11024,    22048, 0x0665d7f4
+0,          1,          1,        1,   192000, 0x00000000
+0,          2,          2,        1,   192000, 0x00000000
+0,          3,          3,        1,   192000, 0x00000000
+0,          4,          4,        1,   192000, 0x9ee00ccf
+0,          5,          5,        1,   192000, 0x67256507
+0,          6,          6,        1,   192000, 0x74c70e87
+0,          7,          7,        1,   192000, 0x8ecdce9a
+1,      11024,      11024,     1470,     2940, 0x0f3c64cb
+0,          8,          8,        1,   192000, 0xc40f8efd
+1,      12494,      12494,     1470,     2940, 0xc90b9e78
+0,          9,          9,        1,   192000, 0xb8107dfb
+1,      13964,      13964,     1470,     2940, 0x146246a3
+0,         10,         10,        1,   192000, 0xb4e504eb
+1,      15434,      15434,     1470,     2940, 0xd22c714e
+0,         11,         11,        1,   192000, 0x0c7fdb95
+1,      16904,      16904,     1470,     2940, 0xd86b681e
+0,         12,         12,        1,   192000, 0x58c9f045
+1,      18374,      18374,     1470,     2940, 0x12ec8186
+0,         13,         13,        1,   192000, 0xcba9d0e9
+1,      19844,      19844,     1470,     2940, 0x69aa85b6
+0,         14,         14,        1,   192000, 0x392a20f6
+1,      21314,      21314,     1470,     2940, 0xb24d33b0
+0,         15,         15,        1,   192000, 0xc37905cc
+1,      22784,      22784,     1470,     2940, 0x3f7b0f0d
+0,         16,         16,        1,   192000, 0xe278cf95
+1,      24254,      24254,     1470,     2940, 0x64f10f7e
+0,         17,         17,        1,   192000, 0x3d03b01d
+1,      25724,      25724,     1470,     2940, 0xd6ea379a
+0,         18,         18,        1,   192000, 0x16a26f28
+1,      27194,      27194,     1470,     2940, 0x7c38e830
+0,         19,         19,        1,   192000, 0xdd17f51c
+1,      28664,      28664,     1470,     2940, 0xc28ff132
+0,         20,         20,        1,   192000, 0x19703b85
+1,      30134,      30134,     1470,     2940, 0xe7b11629
+0,         21,         21,        1,   192000, 0xe51f0e70
+1,      31604,      31604,     1470,     2940, 0xeb86fdcb
+0,         22,         22,        1,   192000, 0x6f94ad2a
+1,      33074,      33074,     1470,     2940, 0x5508f586
+0,         23,         23,        1,   192000, 0x71e449f1
+1,      34544,      34544,     1470,     2940, 0xf4fa1f1b
+0,         24,         24,        1,   192000, 0x1dcacc52
+1,      36014,      36014,     1470,     2940, 0x9e5ff976
+0,         25,         25,        1,   192000, 0x49c23f58
+1,      37484,      37484,     1470,     2940, 0xcfc4e08f
+0,         26,         26,        1,   192000, 0x4ce61551
+1,      38954,      38954,     1470,     2940, 0x74bde7ed
+0,         27,         27,        1,   192000, 0xe54832d5
+1,      40424,      40424,     1470,     2940, 0x3e4ae245
+0,         28,         28,        1,   192000, 0xbae28a59
+1,      41894,      41894,     1470,     2940, 0x4c6a8e56
+0,         29,         29,        1,   192000, 0xe8a4efbe
+1,      43364,      43364,     1470,     2940, 0xa09d86ab
+0,         30,         30,        1,   192000, 0xe9e96883
+1,      44834,      44834,     1470,     2940, 0xc8531912
+0,         31,         31,        1,   192000, 0xa5468c49
+1,      46304,      46304,     1470,     2940, 0xa5f266aa
+0,         32,         32,        1,   192000, 0x7ec6936a
+1,      47774,      47774,     1470,     2940, 0x587a4187
+0,         33,         33,        1,   192000, 0x46e53ee4
+1,      49244,      49244,     1470,     2940, 0x14752d45
+0,         34,         34,        1,   192000, 0x937b168a
+1,      50714,      50714,     1470,     2940, 0x558cde10
+0,         35,         35,        1,   192000, 0xed76cec4
+1,      52184,      52184,     1470,     2940, 0x735fee38
+0,         36,         36,        1,   192000, 0x4b9f454d
+1,      53654,      53654,     1470,     2940, 0xac8bb6c8
+0,         37,         37,        1,   192000, 0xb58c1566
+1,      55124,      55124,     1470,     2940, 0xa503c73b
+0,         38,         38,        1,   192000, 0xb58c1566
+1,      56594,      56594,     1470,     2940, 0x7cd588a3
+1,      58064,      58064,     1470,     2940, 0xa6974b04
+1,      59534,      59534,     1470,     2940, 0xbf448241
+1,      61004,      61004,     1470,     2940, 0x2a5c2759
+1,      62474,      62474,     1470,     2940, 0xd0de5ce0
+1,      63944,      63944,     1470,     2940, 0xc0486649
+1,      65414,      65414,     1470,     2940, 0x48b040af
+1,      66884,      66884,     1470,     2940, 0x82a338a9