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-cacqp3_sony_d b/tests/ref/fate/h264-conformance-cacqp3_sony_d
index 56881b3d60..c3685296fb 100644
--- a/tests/ref/fate/h264-conformance-cacqp3_sony_d
+++ b/tests/ref/fate/h264-conformance-cacqp3_sony_d
@@ -1,50 +1,51 @@
-0, 0, 38016, 0x295a375c
-0, 3600, 38016, 0xd0da1f37
-0, 7200, 38016, 0x0e5ed514
-0, 10800, 38016, 0x477dcbe7
-0, 14400, 38016, 0x2e0980f3
-0, 18000, 38016, 0xf6d0888f
-0, 21600, 38016, 0x884f4bf2
-0, 25200, 38016, 0x75135ea9
-0, 28800, 38016, 0xc85031bd
-0, 32400, 38016, 0x4dde6353
-0, 36000, 38016, 0x8c8f4f2a
-0, 39600, 38016, 0xbdae892b
-0, 43200, 38016, 0x4898783a
-0, 46800, 38016, 0xb4cc9d6b
-0, 50400, 38016, 0xd24f8797
-0, 54000, 38016, 0x74c4a0df
-0, 57600, 38016, 0x43e58a83
-0, 61200, 38016, 0x05bba901
-0, 64800, 38016, 0xe2d57f63
-0, 68400, 38016, 0xdb398611
-0, 72000, 38016, 0x7f143de2
-0, 75600, 38016, 0xff39406f
-0, 79200, 38016, 0xfed61162
-0, 82800, 38016, 0xb9e62a1e
-0, 86400, 38016, 0x65f316d1
-0, 90000, 38016, 0xda782b9c
-0, 93600, 38016, 0xb64b202c
-0, 97200, 38016, 0xb2b141ea
-0, 100800, 38016, 0xdb6b421b
-0, 104400, 38016, 0xf3287342
-0, 108000, 38016, 0xfbb35b92
-0, 111600, 38016, 0x8c77a0de
-0, 115200, 38016, 0x326c9cb4
-0, 118800, 38016, 0x7e73cc0c
-0, 122400, 38016, 0xb948b8e9
-0, 126000, 38016, 0x6f7adb29
-0, 129600, 38016, 0xb629b8c5
-0, 133200, 38016, 0xf798ccd4
-0, 136800, 38016, 0xde5bb331
-0, 140400, 38016, 0xbca4d8dc
-0, 144000, 38016, 0x9369ba10
-0, 147600, 38016, 0x581ed965
-0, 151200, 38016, 0xce7bbd59
-0, 154800, 38016, 0x95d9ce3d
-0, 158400, 38016, 0x6154bd98
-0, 162000, 38016, 0xa279c487
-0, 165600, 38016, 0x8169b5a6
-0, 169200, 38016, 0x709dc334
-0, 172800, 38016, 0x82aabea1
-0, 176400, 38016, 0x6923c4c3
+#tb 0: 1/25
+0,          0,          0,        1,    38016, 0x295a375c
+0,          1,          1,        1,    38016, 0xd0da1f37
+0,          2,          2,        1,    38016, 0x0e5ed514
+0,          3,          3,        1,    38016, 0x477dcbe7
+0,          4,          4,        1,    38016, 0x2e0980f3
+0,          5,          5,        1,    38016, 0xf6d0888f
+0,          6,          6,        1,    38016, 0x884f4bf2
+0,          7,          7,        1,    38016, 0x75135ea9
+0,          8,          8,        1,    38016, 0xc85031bd
+0,          9,          9,        1,    38016, 0x4dde6353
+0,         10,         10,        1,    38016, 0x8c8f4f2a
+0,         11,         11,        1,    38016, 0xbdae892b
+0,         12,         12,        1,    38016, 0x4898783a
+0,         13,         13,        1,    38016, 0xb4cc9d6b
+0,         14,         14,        1,    38016, 0xd24f8797
+0,         15,         15,        1,    38016, 0x74c4a0df
+0,         16,         16,        1,    38016, 0x43e58a83
+0,         17,         17,        1,    38016, 0x05bba901
+0,         18,         18,        1,    38016, 0xe2d57f63
+0,         19,         19,        1,    38016, 0xdb398611
+0,         20,         20,        1,    38016, 0x7f143de2
+0,         21,         21,        1,    38016, 0xff39406f
+0,         22,         22,        1,    38016, 0xfed61162
+0,         23,         23,        1,    38016, 0xb9e62a1e
+0,         24,         24,        1,    38016, 0x65f316d1
+0,         25,         25,        1,    38016, 0xda782b9c
+0,         26,         26,        1,    38016, 0xb64b202c
+0,         27,         27,        1,    38016, 0xb2b141ea
+0,         28,         28,        1,    38016, 0xdb6b421b
+0,         29,         29,        1,    38016, 0xf3287342
+0,         30,         30,        1,    38016, 0xfbb35b92
+0,         31,         31,        1,    38016, 0x8c77a0de
+0,         32,         32,        1,    38016, 0x326c9cb4
+0,         33,         33,        1,    38016, 0x7e73cc0c
+0,         34,         34,        1,    38016, 0xb948b8e9
+0,         35,         35,        1,    38016, 0x6f7adb29
+0,         36,         36,        1,    38016, 0xb629b8c5
+0,         37,         37,        1,    38016, 0xf798ccd4
+0,         38,         38,        1,    38016, 0xde5bb331
+0,         39,         39,        1,    38016, 0xbca4d8dc
+0,         40,         40,        1,    38016, 0x9369ba10
+0,         41,         41,        1,    38016, 0x581ed965
+0,         42,         42,        1,    38016, 0xce7bbd59
+0,         43,         43,        1,    38016, 0x95d9ce3d
+0,         44,         44,        1,    38016, 0x6154bd98
+0,         45,         45,        1,    38016, 0xa279c487
+0,         46,         46,        1,    38016, 0x8169b5a6
+0,         47,         47,        1,    38016, 0x709dc334
+0,         48,         48,        1,    38016, 0x82aabea1
+0,         49,         49,        1,    38016, 0x6923c4c3