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

diff --git a/tests/ref/fate/gsm-ms b/tests/ref/fate/gsm-ms
index 76a6f2954f..6d15cb8f3f 100644
--- a/tests/ref/fate/gsm-ms
+++ b/tests/ref/fate/gsm-ms
@@ -1,89 +1,90 @@
-0, 0, 640, 0xf79c59ee
-0, 3600, 640, 0x6e6248be
-0, 7200, 640, 0x2a5b3aed
-0, 10800, 640, 0xf7012e06
-0, 14400, 640, 0x626645cd
-0, 18000, 640, 0x9f482b66
-0, 21600, 640, 0xea443886
-0, 25200, 640, 0xa79b3dc0
-0, 28800, 640, 0x0161263f
-0, 32400, 640, 0x61b33154
-0, 36000, 640, 0xf7fa388c
-0, 39600, 640, 0xb63038e9
-0, 43200, 640, 0x61b03506
-0, 46800, 640, 0xed4e2eac
-0, 50400, 640, 0x9b8127f1
-0, 54000, 640, 0xe50627be
-0, 57600, 640, 0x6b5038f9
-0, 61200, 640, 0x8e794c10
-0, 64800, 640, 0x426d2c93
-0, 68400, 640, 0x9a373111
-0, 72000, 640, 0x94132ccb
-0, 75600, 640, 0x610b3788
-0, 79200, 640, 0x27204206
-0, 82800, 640, 0xbdf82268
-0, 86400, 640, 0x2e653066
-0, 90000, 640, 0xccfd2328
-0, 93600, 640, 0xf2431e04
-0, 97200, 640, 0x7b412094
-0, 100800, 640, 0x5c2635fa
-0, 104400, 640, 0xdcbd2c60
-0, 108000, 640, 0x65173699
-0, 111600, 640, 0xbcff19ed
-0, 115200, 640, 0xf5b2206c
-0, 118800, 640, 0x587e460c
-0, 122400, 640, 0x2418382d
-0, 126000, 640, 0xbfad2f9b
-0, 129600, 640, 0x87d92d6c
-0, 133200, 640, 0xdc582c69
-0, 136800, 640, 0xcfe52ebf
-0, 140400, 640, 0xe0032e70
-0, 144000, 640, 0xf8a61b57
-0, 147600, 640, 0xa9ef2ee5
-0, 151200, 640, 0x7f513313
-0, 154800, 640, 0x93731177
-0, 158400, 640, 0xed2c2340
-0, 162000, 640, 0x85b02913
-0, 165600, 640, 0xa5a92f3e
-0, 169200, 640, 0x72472490
-0, 172800, 640, 0x856231fc
-0, 176400, 640, 0xda2e3c22
-0, 180000, 640, 0xcce84c36
-0, 183600, 640, 0x39312c78
-0, 187200, 640, 0xf1aa2365
-0, 190800, 640, 0x1dba3f7e
-0, 194400, 640, 0x21953579
-0, 198000, 640, 0xbbd52c22
-0, 201600, 640, 0x45c71537
-0, 205200, 640, 0x26051cec
-0, 208800, 640, 0x27ae223e
-0, 212400, 640, 0x223c0bb8
-0, 216000, 640, 0xc5b72796
-0, 219600, 640, 0xe7fd294d
-0, 223200, 640, 0x19042293
-0, 226800, 640, 0xa6572c6b
-0, 230400, 640, 0x58ac1d16
-0, 234000, 640, 0xd0631bd6
-0, 237600, 640, 0xe74f276c
-0, 241200, 640, 0x87d0295f
-0, 244800, 640, 0x054e3dc8
-0, 248400, 640, 0x0ca51c2d
-0, 252000, 640, 0x17a02616
-0, 255600, 640, 0x56b2235d
-0, 259200, 640, 0x1cd93302
-0, 262800, 640, 0xe3672352
-0, 266400, 640, 0xc99f2e45
-0, 270000, 640, 0x36a43e9d
-0, 273600, 640, 0xfcd73e87
-0, 277200, 640, 0x813b2e20
-0, 280800, 640, 0x8f7a4cac
-0, 284400, 640, 0xcf3e4106
-0, 288000, 640, 0x8a752b07
-0, 291600, 640, 0xe5013dcd
-0, 295200, 640, 0xda4a3d03
-0, 298800, 640, 0x05ce2c64
-0, 302400, 640, 0x1e0f42b5
-0, 306000, 640, 0xe4bd326a
-0, 309600, 640, 0x701c28de
-0, 313200, 640, 0xd0b02f97
-0, 316800, 640, 0x7950419b
+#tb 0: 1/8000
+0,          0,          0,      320,      640, 0xf79c59ee
+0,        320,        320,      320,      640, 0x6e6248be
+0,        640,        640,      320,      640, 0x2a5b3aed
+0,        960,        960,      320,      640, 0xf7012e06
+0,       1280,       1280,      320,      640, 0x626645cd
+0,       1600,       1600,      320,      640, 0x9f482b66
+0,       1920,       1920,      320,      640, 0xea443886
+0,       2240,       2240,      320,      640, 0xa79b3dc0
+0,       2560,       2560,      320,      640, 0x0161263f
+0,       2880,       2880,      320,      640, 0x61b33154
+0,       3200,       3200,      320,      640, 0xf7fa388c
+0,       3520,       3520,      320,      640, 0xb63038e9
+0,       3840,       3840,      320,      640, 0x61b03506
+0,       4160,       4160,      320,      640, 0xed4e2eac
+0,       4480,       4480,      320,      640, 0x9b8127f1
+0,       4800,       4800,      320,      640, 0xe50627be
+0,       5120,       5120,      320,      640, 0x6b5038f9
+0,       5440,       5440,      320,      640, 0x8e794c10
+0,       5760,       5760,      320,      640, 0x426d2c93
+0,       6080,       6080,      320,      640, 0x9a373111
+0,       6400,       6400,      320,      640, 0x94132ccb
+0,       6720,       6720,      320,      640, 0x610b3788
+0,       7040,       7040,      320,      640, 0x27204206
+0,       7360,       7360,      320,      640, 0xbdf82268
+0,       7680,       7680,      320,      640, 0x2e653066
+0,       8000,       8000,      320,      640, 0xccfd2328
+0,       8320,       8320,      320,      640, 0xf2431e04
+0,       8640,       8640,      320,      640, 0x7b412094
+0,       8960,       8960,      320,      640, 0x5c2635fa
+0,       9280,       9280,      320,      640, 0xdcbd2c60
+0,       9600,       9600,      320,      640, 0x65173699
+0,       9920,       9920,      320,      640, 0xbcff19ed
+0,      10240,      10240,      320,      640, 0xf5b2206c
+0,      10560,      10560,      320,      640, 0x587e460c
+0,      10880,      10880,      320,      640, 0x2418382d
+0,      11200,      11200,      320,      640, 0xbfad2f9b
+0,      11520,      11520,      320,      640, 0x87d92d6c
+0,      11840,      11840,      320,      640, 0xdc582c69
+0,      12160,      12160,      320,      640, 0xcfe52ebf
+0,      12480,      12480,      320,      640, 0xe0032e70
+0,      12800,      12800,      320,      640, 0xf8a61b57
+0,      13120,      13120,      320,      640, 0xa9ef2ee5
+0,      13440,      13440,      320,      640, 0x7f513313
+0,      13760,      13760,      320,      640, 0x93731177
+0,      14080,      14080,      320,      640, 0xed2c2340
+0,      14400,      14400,      320,      640, 0x85b02913
+0,      14720,      14720,      320,      640, 0xa5a92f3e
+0,      15040,      15040,      320,      640, 0x72472490
+0,      15360,      15360,      320,      640, 0x856231fc
+0,      15680,      15680,      320,      640, 0xda2e3c22
+0,      16000,      16000,      320,      640, 0xcce84c36
+0,      16320,      16320,      320,      640, 0x39312c78
+0,      16640,      16640,      320,      640, 0xf1aa2365
+0,      16960,      16960,      320,      640, 0x1dba3f7e
+0,      17280,      17280,      320,      640, 0x21953579
+0,      17600,      17600,      320,      640, 0xbbd52c22
+0,      17920,      17920,      320,      640, 0x45c71537
+0,      18240,      18240,      320,      640, 0x26051cec
+0,      18560,      18560,      320,      640, 0x27ae223e
+0,      18880,      18880,      320,      640, 0x223c0bb8
+0,      19200,      19200,      320,      640, 0xc5b72796
+0,      19520,      19520,      320,      640, 0xe7fd294d
+0,      19840,      19840,      320,      640, 0x19042293
+0,      20160,      20160,      320,      640, 0xa6572c6b
+0,      20480,      20480,      320,      640, 0x58ac1d16
+0,      20800,      20800,      320,      640, 0xd0631bd6
+0,      21120,      21120,      320,      640, 0xe74f276c
+0,      21440,      21440,      320,      640, 0x87d0295f
+0,      21760,      21760,      320,      640, 0x054e3dc8
+0,      22080,      22080,      320,      640, 0x0ca51c2d
+0,      22400,      22400,      320,      640, 0x17a02616
+0,      22720,      22720,      320,      640, 0x56b2235d
+0,      23040,      23040,      320,      640, 0x1cd93302
+0,      23360,      23360,      320,      640, 0xe3672352
+0,      23680,      23680,      320,      640, 0xc99f2e45
+0,      24000,      24000,      320,      640, 0x36a43e9d
+0,      24320,      24320,      320,      640, 0xfcd73e87
+0,      24640,      24640,      320,      640, 0x813b2e20
+0,      24960,      24960,      320,      640, 0x8f7a4cac
+0,      25280,      25280,      320,      640, 0xcf3e4106
+0,      25600,      25600,      320,      640, 0x8a752b07
+0,      25920,      25920,      320,      640, 0xe5013dcd
+0,      26240,      26240,      320,      640, 0xda4a3d03
+0,      26560,      26560,      320,      640, 0x05ce2c64
+0,      26880,      26880,      320,      640, 0x1e0f42b5
+0,      27200,      27200,      320,      640, 0xe4bd326a
+0,      27520,      27520,      320,      640, 0x701c28de
+0,      27840,      27840,      320,      640, 0xd0b02f97
+0,      28160,      28160,      320,      640, 0x7950419b