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, 51 insertions, 50 deletions

diff --git a/tests/ref/fate/h264-conformance-caqp1_sony_b b/tests/ref/fate/h264-conformance-caqp1_sony_b
index fe023eb41e..beca1c5006 100644
--- a/tests/ref/fate/h264-conformance-caqp1_sony_b
+++ b/tests/ref/fate/h264-conformance-caqp1_sony_b
@@ -1,50 +1,51 @@
-0, 0, 38016, 0x25f92b0e
-0, 3600, 38016, 0x2ecbe752
-0, 7200, 38016, 0x3432e744
-0, 10800, 38016, 0x7970aa2e
-0, 14400, 38016, 0x250787bf
-0, 18000, 38016, 0xd58e5e56
-0, 21600, 38016, 0xf4b8580f
-0, 25200, 38016, 0x9acb4096
-0, 28800, 38016, 0xeed0476f
-0, 32400, 38016, 0xe33846ef
-0, 36000, 38016, 0x02da4e76
-0, 39600, 38016, 0xd3e572f8
-0, 43200, 38016, 0x5fd27f8a
-0, 46800, 38016, 0xfa169823
-0, 50400, 38016, 0xcc6b8d76
-0, 54000, 38016, 0xcc4da11f
-0, 57600, 38016, 0x32259b9d
-0, 61200, 38016, 0xf1e39b70
-0, 64800, 38016, 0xb49d7480
-0, 68400, 38016, 0x3dc158e9
-0, 72000, 38016, 0x4ce134db
-0, 75600, 38016, 0x4fb30b43
-0, 79200, 38016, 0xda49fe5f
-0, 82800, 38016, 0x7fda0d68
-0, 86400, 38016, 0x3a8b25e3
-0, 90000, 38016, 0x3df11d4e
-0, 93600, 38016, 0x26e11107
-0, 97200, 38016, 0xdc3b03a7
-0, 100800, 38016, 0x72b2434d
-0, 104400, 38016, 0x2a013e27
-0, 108000, 38016, 0xf95a4c2e
-0, 111600, 38016, 0x1e7b6656
-0, 115200, 38016, 0x776a81c8
-0, 118800, 38016, 0x162cb0bf
-0, 122400, 38016, 0x7ff4aaf5
-0, 126000, 38016, 0x7150b50b
-0, 129600, 38016, 0xf7d0b889
-0, 133200, 38016, 0xbe09b5c2
-0, 136800, 38016, 0xf6f7d29c
-0, 140400, 38016, 0x4356b996
-0, 144000, 38016, 0xb056c4b4
-0, 147600, 38016, 0x38e9c6e6
-0, 151200, 38016, 0x9c64ab45
-0, 154800, 38016, 0x31189eef
-0, 158400, 38016, 0x1ee3a3b1
-0, 162000, 38016, 0x8bed7c95
-0, 165600, 38016, 0x30357cee
-0, 169200, 38016, 0x5d828428
-0, 172800, 38016, 0xc06388b3
-0, 176400, 38016, 0x2af597b4
+#tb 0: 1/25
+0,          0,          0,        1,    38016, 0x25f92b0e
+0,          1,          1,        1,    38016, 0x2ecbe752
+0,          2,          2,        1,    38016, 0x3432e744
+0,          3,          3,        1,    38016, 0x7970aa2e
+0,          4,          4,        1,    38016, 0x250787bf
+0,          5,          5,        1,    38016, 0xd58e5e56
+0,          6,          6,        1,    38016, 0xf4b8580f
+0,          7,          7,        1,    38016, 0x9acb4096
+0,          8,          8,        1,    38016, 0xeed0476f
+0,          9,          9,        1,    38016, 0xe33846ef
+0,         10,         10,        1,    38016, 0x02da4e76
+0,         11,         11,        1,    38016, 0xd3e572f8
+0,         12,         12,        1,    38016, 0x5fd27f8a
+0,         13,         13,        1,    38016, 0xfa169823
+0,         14,         14,        1,    38016, 0xcc6b8d76
+0,         15,         15,        1,    38016, 0xcc4da11f
+0,         16,         16,        1,    38016, 0x32259b9d
+0,         17,         17,        1,    38016, 0xf1e39b70
+0,         18,         18,        1,    38016, 0xb49d7480
+0,         19,         19,        1,    38016, 0x3dc158e9
+0,         20,         20,        1,    38016, 0x4ce134db
+0,         21,         21,        1,    38016, 0x4fb30b43
+0,         22,         22,        1,    38016, 0xda49fe5f
+0,         23,         23,        1,    38016, 0x7fda0d68
+0,         24,         24,        1,    38016, 0x3a8b25e3
+0,         25,         25,        1,    38016, 0x3df11d4e
+0,         26,         26,        1,    38016, 0x26e11107
+0,         27,         27,        1,    38016, 0xdc3b03a7
+0,         28,         28,        1,    38016, 0x72b2434d
+0,         29,         29,        1,    38016, 0x2a013e27
+0,         30,         30,        1,    38016, 0xf95a4c2e
+0,         31,         31,        1,    38016, 0x1e7b6656
+0,         32,         32,        1,    38016, 0x776a81c8
+0,         33,         33,        1,    38016, 0x162cb0bf
+0,         34,         34,        1,    38016, 0x7ff4aaf5
+0,         35,         35,        1,    38016, 0x7150b50b
+0,         36,         36,        1,    38016, 0xf7d0b889
+0,         37,         37,        1,    38016, 0xbe09b5c2
+0,         38,         38,        1,    38016, 0xf6f7d29c
+0,         39,         39,        1,    38016, 0x4356b996
+0,         40,         40,        1,    38016, 0xb056c4b4
+0,         41,         41,        1,    38016, 0x38e9c6e6
+0,         42,         42,        1,    38016, 0x9c64ab45
+0,         43,         43,        1,    38016, 0x31189eef
+0,         44,         44,        1,    38016, 0x1ee3a3b1
+0,         45,         45,        1,    38016, 0x8bed7c95
+0,         46,         46,        1,    38016, 0x30357cee
+0,         47,         47,        1,    38016, 0x5d828428
+0,         48,         48,        1,    38016, 0xc06388b3
+0,         49,         49,        1,    38016, 0x2af597b4