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, 63 insertions, 62 deletions

diff --git a/tests/ref/fate/h264-conformance-mr1_bt_a b/tests/ref/fate/h264-conformance-mr1_bt_a
index b077cd4370..11eb5903fe 100644
--- a/tests/ref/fate/h264-conformance-mr1_bt_a
+++ b/tests/ref/fate/h264-conformance-mr1_bt_a
@@ -1,62 +1,63 @@
-0, 0, 38016, 0xc6658719
-0, 3600, 38016, 0x8a7c7423
-0, 7200, 38016, 0x97e99b66
-0, 10800, 38016, 0x73c4c4f7
-0, 14400, 38016, 0xb45bfb44
-0, 18000, 38016, 0x1bc3249c
-0, 21600, 38016, 0xd98a3121
-0, 25200, 38016, 0x6f0aefc1
-0, 28800, 38016, 0x6287f651
-0, 32400, 38016, 0x2a4a1630
-0, 36000, 38016, 0x5e7b5a35
-0, 39600, 38016, 0x58847533
-0, 43200, 38016, 0x2bad942b
-0, 46800, 38016, 0x17d75cb1
-0, 50400, 38016, 0x6d8e818d
-0, 54000, 38016, 0xfa3165db
-0, 57600, 38016, 0x6a6e249f
-0, 61200, 38016, 0x2d232ece
-0, 64800, 38016, 0xfba6616e
-0, 68400, 38016, 0xa9e7533f
-0, 72000, 38016, 0x7c4827e6
-0, 75600, 38016, 0xf570f8ca
-0, 79200, 38016, 0x0dac953f
-0, 82800, 38016, 0x74cb5f30
-0, 86400, 38016, 0x038ce61b
-0, 90000, 38016, 0x291f8ecb
-0, 93600, 38016, 0x768a6539
-0, 97200, 38016, 0x27a960e6
-0, 100800, 38016, 0x4d8ab279
-0, 104400, 38016, 0x7da78115
-0, 108000, 38016, 0x27beadcf
-0, 111600, 38016, 0x98c43180
-0, 115200, 38016, 0x566d55db
-0, 118800, 38016, 0xddc19fda
-0, 122400, 38016, 0xe353c891
-0, 126000, 38016, 0x17e2e3ab
-0, 129600, 38016, 0x8759e7c3
-0, 133200, 38016, 0x9d93bca9
-0, 136800, 38016, 0x8b77af4e
-0, 140400, 38016, 0x9b799dac
-0, 144000, 38016, 0xcb8bc504
-0, 147600, 38016, 0x58e989c8
-0, 151200, 38016, 0x4e4dbb7f
-0, 154800, 38016, 0xdfa6934e
-0, 158400, 38016, 0x14947459
-0, 162000, 38016, 0x7a31ff6a
-0, 165600, 38016, 0xc044fbc3
-0, 169200, 38016, 0xcaa723d1
-0, 172800, 38016, 0x325c1dca
-0, 176400, 38016, 0x62fb027d
-0, 180000, 38016, 0x710f3ae9
-0, 183600, 38016, 0xdbbf1804
-0, 187200, 38016, 0x1487f491
-0, 190800, 38016, 0x6a722d73
-0, 194400, 38016, 0xeb7258dd
-0, 198000, 38016, 0x685e8a68
-0, 201600, 38016, 0x1627800e
-0, 205200, 38016, 0xa88a9a31
-0, 208800, 38016, 0x4d5eaf56
-0, 212400, 38016, 0xe3a9af0a
-0, 216000, 38016, 0x3c38b8b2
-0, 219600, 38016, 0x991fc29e
+#tb 0: 1/25
+0,          0,          0,        1,    38016, 0xc6658719
+0,          1,          1,        1,    38016, 0x8a7c7423
+0,          2,          2,        1,    38016, 0x97e99b66
+0,          3,          3,        1,    38016, 0x73c4c4f7
+0,          4,          4,        1,    38016, 0xb45bfb44
+0,          5,          5,        1,    38016, 0x1bc3249c
+0,          6,          6,        1,    38016, 0xd98a3121
+0,          7,          7,        1,    38016, 0x6f0aefc1
+0,          8,          8,        1,    38016, 0x6287f651
+0,          9,          9,        1,    38016, 0x2a4a1630
+0,         10,         10,        1,    38016, 0x5e7b5a35
+0,         11,         11,        1,    38016, 0x58847533
+0,         12,         12,        1,    38016, 0x2bad942b
+0,         13,         13,        1,    38016, 0x17d75cb1
+0,         14,         14,        1,    38016, 0x6d8e818d
+0,         15,         15,        1,    38016, 0xfa3165db
+0,         16,         16,        1,    38016, 0x6a6e249f
+0,         17,         17,        1,    38016, 0x2d232ece
+0,         18,         18,        1,    38016, 0xfba6616e
+0,         19,         19,        1,    38016, 0xa9e7533f
+0,         20,         20,        1,    38016, 0x7c4827e6
+0,         21,         21,        1,    38016, 0xf570f8ca
+0,         22,         22,        1,    38016, 0x0dac953f
+0,         23,         23,        1,    38016, 0x74cb5f30
+0,         24,         24,        1,    38016, 0x038ce61b
+0,         25,         25,        1,    38016, 0x291f8ecb
+0,         26,         26,        1,    38016, 0x768a6539
+0,         27,         27,        1,    38016, 0x27a960e6
+0,         28,         28,        1,    38016, 0x4d8ab279
+0,         29,         29,        1,    38016, 0x7da78115
+0,         30,         30,        1,    38016, 0x27beadcf
+0,         31,         31,        1,    38016, 0x98c43180
+0,         32,         32,        1,    38016, 0x566d55db
+0,         33,         33,        1,    38016, 0xddc19fda
+0,         34,         34,        1,    38016, 0xe353c891
+0,         35,         35,        1,    38016, 0x17e2e3ab
+0,         36,         36,        1,    38016, 0x8759e7c3
+0,         37,         37,        1,    38016, 0x9d93bca9
+0,         38,         38,        1,    38016, 0x8b77af4e
+0,         39,         39,        1,    38016, 0x9b799dac
+0,         40,         40,        1,    38016, 0xcb8bc504
+0,         41,         41,        1,    38016, 0x58e989c8
+0,         42,         42,        1,    38016, 0x4e4dbb7f
+0,         43,         43,        1,    38016, 0xdfa6934e
+0,         44,         44,        1,    38016, 0x14947459
+0,         45,         45,        1,    38016, 0x7a31ff6a
+0,         46,         46,        1,    38016, 0xc044fbc3
+0,         47,         47,        1,    38016, 0xcaa723d1
+0,         48,         48,        1,    38016, 0x325c1dca
+0,         49,         49,        1,    38016, 0x62fb027d
+0,         50,         50,        1,    38016, 0x710f3ae9
+0,         51,         51,        1,    38016, 0xdbbf1804
+0,         52,         52,        1,    38016, 0x1487f491
+0,         53,         53,        1,    38016, 0x6a722d73
+0,         54,         54,        1,    38016, 0xeb7258dd
+0,         55,         55,        1,    38016, 0x685e8a68
+0,         56,         56,        1,    38016, 0x1627800e
+0,         57,         57,        1,    38016, 0xa88a9a31
+0,         58,         58,        1,    38016, 0x4d5eaf56
+0,         59,         59,        1,    38016, 0xe3a9af0a
+0,         60,         60,        1,    38016, 0x3c38b8b2
+0,         61,         61,        1,    38016, 0x991fc29e