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-caba1_sony_d b/tests/ref/fate/h264-conformance-caba1_sony_d
index 62232d23ed..35798202d6 100644
--- a/tests/ref/fate/h264-conformance-caba1_sony_d
+++ b/tests/ref/fate/h264-conformance-caba1_sony_d
@@ -1,50 +1,51 @@
-0, 0, 38016, 0xb3883478
-0, 3600, 38016, 0x99e1fe60
-0, 7200, 38016, 0x65eace24
-0, 10800, 38016, 0xb2b0a513
-0, 14400, 38016, 0x8af47c64
-0, 18000, 38016, 0xa56670c6
-0, 21600, 38016, 0x11d45ac9
-0, 25200, 38016, 0xcd4e4f18
-0, 28800, 38016, 0x399934b2
-0, 32400, 38016, 0xedd23f7b
-0, 36000, 38016, 0x38c350b9
-0, 39600, 38016, 0xdd937244
-0, 43200, 38016, 0x39c67be6
-0, 46800, 38016, 0xabb7a34d
-0, 50400, 38016, 0x535d971f
-0, 54000, 38016, 0xd41c9cf7
-0, 57600, 38016, 0xfddda183
-0, 61200, 38016, 0x7b659dc5
-0, 64800, 38016, 0x06978b0c
-0, 68400, 38016, 0x62596b00
-0, 72000, 38016, 0x5e504719
-0, 75600, 38016, 0x55252349
-0, 79200, 38016, 0xdbdd0d9e
-0, 82800, 38016, 0x550a0918
-0, 86400, 38016, 0xb890feeb
-0, 90000, 38016, 0x8aa01221
-0, 93600, 38016, 0xfcc01085
-0, 97200, 38016, 0x78f11d7d
-0, 100800, 38016, 0xfcd33487
-0, 104400, 38016, 0x9b444cfc
-0, 108000, 38016, 0xed9563d3
-0, 111600, 38016, 0x07e17628
-0, 115200, 38016, 0x9bb792fd
-0, 118800, 38016, 0xa6aea73d
-0, 122400, 38016, 0x4b90b778
-0, 126000, 38016, 0x6df2b998
-0, 129600, 38016, 0x799eb2db
-0, 133200, 38016, 0x48dab272
-0, 136800, 38016, 0x9877b4eb
-0, 140400, 38016, 0x901ab58e
-0, 144000, 38016, 0x32c2beb1
-0, 147600, 38016, 0xe542b56e
-0, 151200, 38016, 0x1edf9ff4
-0, 154800, 38016, 0xf103942c
-0, 158400, 38016, 0x097a8dc7
-0, 162000, 38016, 0xe3728780
-0, 165600, 38016, 0xce9a9026
-0, 169200, 38016, 0x78ba841b
-0, 172800, 38016, 0x5fc687ab
-0, 176400, 38016, 0x03a49472
+#tb 0: 1/25
+0,          0,          0,        1,    38016, 0xb3883478
+0,          1,          1,        1,    38016, 0x99e1fe60
+0,          2,          2,        1,    38016, 0x65eace24
+0,          3,          3,        1,    38016, 0xb2b0a513
+0,          4,          4,        1,    38016, 0x8af47c64
+0,          5,          5,        1,    38016, 0xa56670c6
+0,          6,          6,        1,    38016, 0x11d45ac9
+0,          7,          7,        1,    38016, 0xcd4e4f18
+0,          8,          8,        1,    38016, 0x399934b2
+0,          9,          9,        1,    38016, 0xedd23f7b
+0,         10,         10,        1,    38016, 0x38c350b9
+0,         11,         11,        1,    38016, 0xdd937244
+0,         12,         12,        1,    38016, 0x39c67be6
+0,         13,         13,        1,    38016, 0xabb7a34d
+0,         14,         14,        1,    38016, 0x535d971f
+0,         15,         15,        1,    38016, 0xd41c9cf7
+0,         16,         16,        1,    38016, 0xfddda183
+0,         17,         17,        1,    38016, 0x7b659dc5
+0,         18,         18,        1,    38016, 0x06978b0c
+0,         19,         19,        1,    38016, 0x62596b00
+0,         20,         20,        1,    38016, 0x5e504719
+0,         21,         21,        1,    38016, 0x55252349
+0,         22,         22,        1,    38016, 0xdbdd0d9e
+0,         23,         23,        1,    38016, 0x550a0918
+0,         24,         24,        1,    38016, 0xb890feeb
+0,         25,         25,        1,    38016, 0x8aa01221
+0,         26,         26,        1,    38016, 0xfcc01085
+0,         27,         27,        1,    38016, 0x78f11d7d
+0,         28,         28,        1,    38016, 0xfcd33487
+0,         29,         29,        1,    38016, 0x9b444cfc
+0,         30,         30,        1,    38016, 0xed9563d3
+0,         31,         31,        1,    38016, 0x07e17628
+0,         32,         32,        1,    38016, 0x9bb792fd
+0,         33,         33,        1,    38016, 0xa6aea73d
+0,         34,         34,        1,    38016, 0x4b90b778
+0,         35,         35,        1,    38016, 0x6df2b998
+0,         36,         36,        1,    38016, 0x799eb2db
+0,         37,         37,        1,    38016, 0x48dab272
+0,         38,         38,        1,    38016, 0x9877b4eb
+0,         39,         39,        1,    38016, 0x901ab58e
+0,         40,         40,        1,    38016, 0x32c2beb1
+0,         41,         41,        1,    38016, 0xe542b56e
+0,         42,         42,        1,    38016, 0x1edf9ff4
+0,         43,         43,        1,    38016, 0xf103942c
+0,         44,         44,        1,    38016, 0x097a8dc7
+0,         45,         45,        1,    38016, 0xe3728780
+0,         46,         46,        1,    38016, 0xce9a9026
+0,         47,         47,        1,    38016, 0x78ba841b
+0,         48,         48,        1,    38016, 0x5fc687ab
+0,         49,         49,        1,    38016, 0x03a49472