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, 29 insertions, 27 deletions

diff --git a/tests/ref/fate/nuv b/tests/ref/fate/nuv
index d34f1f3ea7..0cc9001793 100644
--- a/tests/ref/fate/nuv
+++ b/tests/ref/fate/nuv
@@ -1,27 +1,29 @@
-1, 0, 4096, 0x00000000
-1, 2090, 4096, 0x4dfae7a6
-1, 4180, 4096, 0x3fd9f5c6
-1, 6269, 4096, 0x7b86e310
-1, 8359, 4096, 0x611cece5
-1, 10449, 4096, 0xb7d8e872
-0, 12012, 460800, 0x54aedafe
-1, 12539, 4096, 0x072ef72b
-1, 14629, 4096, 0xb3560144
-0, 15015, 460800, 0xb7aa8b56
-1, 16718, 4096, 0x0a3d119e
-0, 18018, 460800, 0x283ea3b5
-1, 18808, 4096, 0xbe391aa4
-1, 20898, 4096, 0x28f7c6e5
-0, 21021, 460800, 0x283ea3b5
-1, 22988, 4096, 0xca9d9df2
-0, 24024, 460800, 0x10e577de
-1, 25078, 4096, 0x5c6b95a9
-0, 27027, 460800, 0x4e091ee2
-1, 27167, 4096, 0x0bdfc0bf
-1, 29257, 4096, 0xd95a9277
-0, 30030, 460800, 0x2ea88828
-1, 31347, 4096, 0xae2bef2c
-0, 33033, 460800, 0x4b7f4df0
-1, 33437, 4096, 0xbf031e83
-1, 35527, 4096, 0x4c83e2d1
-0, 36036, 460800, 0xa57f20d0
+#tb 0: 100/2997
+#tb 1: 1/44100
+1,          0,          0,     1024,     4096, 0x00000000
+1,       1024,       1024,     1024,     4096, 0x4dfae7a6
+1,       2048,       2048,     1024,     4096, 0x3fd9f5c6
+1,       3072,       3072,     1024,     4096, 0x7b86e310
+1,       4096,       4096,     1024,     4096, 0x611cece5
+1,       5120,       5120,     1024,     4096, 0xb7d8e872
+0,          4,          4,        1,   460800, 0x54aedafe
+1,       6144,       6144,     1024,     4096, 0x072ef72b
+1,       7168,       7168,     1024,     4096, 0xb3560144
+0,          5,          5,        1,   460800, 0xb7aa8b56
+1,       8192,       8192,     1024,     4096, 0x0a3d119e
+0,          6,          6,        1,   460800, 0x283ea3b5
+1,       9216,       9216,     1024,     4096, 0xbe391aa4
+1,      10240,      10240,     1024,     4096, 0x28f7c6e5
+0,          7,          7,        1,   460800, 0x283ea3b5
+1,      11264,      11264,     1024,     4096, 0xca9d9df2
+0,          8,          8,        1,   460800, 0x10e577de
+1,      12288,      12288,     1024,     4096, 0x5c6b95a9
+0,          9,          9,        1,   460800, 0x4e091ee2
+1,      13312,      13312,     1024,     4096, 0x0bdfc0bf
+1,      14336,      14336,     1024,     4096, 0xd95a9277
+0,         10,         10,        1,   460800, 0x2ea88828
+1,      15360,      15360,     1024,     4096, 0xae2bef2c
+0,         11,         11,        1,   460800, 0x4b7f4df0
+1,      16384,      16384,     1024,     4096, 0xbf031e83
+1,      17408,      17408,     1024,     4096, 0x4c83e2d1
+0,         12,         12,        1,   460800, 0xa57f20d0