virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity
FFmpeg/libavutil
History
Haihao Xiang bed670a1de hwcontext_vaapi: Add an assert in vaapi_map_from_drm() 
Every fourcc in vaapi_drm_format_map should be in
vaapi_format_map, so add an assert to ensure we have the right maps.

Signed-off-by: Haihao Xiang <haihao.xiang@intel.com>
2018-05-10 19:52:53 +01:00
..
aarch64
Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'
2018-02-11 23:08:48 -03:00
arm
Merge commit '3a7b4ae62c798edbd82bcd8fef863c74ed2acd4a'
2018-03-30 15:48:17 -03:00
avr32
Merge commit '41ed7ab45fc693f7d7fc35664c0233f4c32d69bb'
2016-06-21 21:55:34 +02:00
bfin
…
mips
avcodec/mips: Improve hevc bi weighted hv mc msa functions
2017-10-25 21:50:37 +02:00
ppc
Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'
2018-02-11 23:08:48 -03:00
sh4
…
tests
avutil/pixdesc: add AV_PIX_FMT_FLAG_ALPHA to AV_PIX_FMT_PAL8
2018-04-30 21:51:31 +02:00
tomi
…
x86
Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'
2018-02-11 23:08:48 -03:00
.gitignore
Merge commit '257f00ec1ab06a2a161f535036c6512f3fc8e801'
2016-06-22 11:28:51 +02:00
adler32.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
adler32.h
avutil: Group hash functions separately in Doxygen
2016-08-02 07:48:08 -07:00
aes_ctr.c
avutil/aes_ctr: Add method to set 16-byte IV.
2018-01-23 21:48:31 +01:00
aes_ctr.h
avutil/aes_ctr: Add method to set 16-byte IV.
2018-01-23 21:48:31 +01:00
aes_internal.h
lavu/aes: align AVAES struct members
2015-10-28 04:23:14 -05:00
aes.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
aes.h
lavu: Drop deprecated context size variables
2015-08-28 16:04:27 +02:00
attributes.h
Merge commit '8e2346154e6d58b733fd20326ce706f82fd91b3e'
2017-10-21 14:25:55 -03:00
audio_fifo.c
Merge commit '0456e684394dc5a7b98ab9ebb48396d743bf3730'
2017-03-24 13:17:55 +01:00
audio_fifo.h
avfilter: add loop filters
2016-02-18 11:55:00 +01:00
avassert.h
avutil/avassert: Add av_assertX_fpu()
2016-10-22 13:50:09 +02:00
avstring.c
avutil/avstring: improve av_strreplace implement
2017-04-11 10:54:35 +08:00
avstring.h
avutil/avstring: improve av_strreplace implement
2017-04-11 10:54:35 +08:00
avutil.h
lavu: add av_fourcc_make_string() and av_fourcc2str()
2017-03-29 14:49:29 +02:00
avutilres.rc
…
base64.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
base64.h
lavu/base64: add AV_BASE64_DECODE_SIZE() macro
2016-04-02 12:48:21 +02:00
blowfish.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
blowfish.h
avutil: undo FF_API_CRYPTO_CONTEXT deprecation
2015-10-16 19:13:38 -03:00
bprint.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
bprint.h
avutil/bprint: C++ compatible AVBPrint definition.
2014-11-29 03:51:35 +01:00
bswap.h
…
buffer_internal.h
Merge commit '27079a426c9d3db918b158976e44b9b143d78e1c'
2017-03-22 17:46:01 +01:00
buffer.c
Merge commit '27079a426c9d3db918b158976e44b9b143d78e1c'
2017-03-22 17:46:01 +01:00
buffer.h
Merge commit 'ec021d48445a414325ad59a73f9cde3212b173e4'
2017-03-18 19:22:30 +01:00
camellia.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
camellia.h
avutil/camellia: fix documentation for av_camellia_crypt()
2015-01-02 21:23:45 +01:00
cast5.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
cast5.h
avutil/cast5: update Doxygen for av_cast5_init with return information
2015-10-15 22:32:58 -04:00
channel_layout.c
avutil/channel_layout: add av_get_extended_channel_layout
2017-01-24 23:51:36 +01:00
channel_layout.h
avutil/channel_layout: add av_get_extended_channel_layout
2017-01-24 23:51:36 +01:00
color_utils.c
lavu: Adding ARIB STD-B67 (hybrid log-gamma) enum value and transfer function.
2016-06-01 16:32:08 +02:00
color_utils.h
avutil/color_utils: Add basic transfer functions for each AVColorTransferCharacteristic
2015-09-10 23:53:05 +02:00
colorspace.h
avfilter/drawutils: add support for full range
2018-05-03 21:43:57 +02:00
common.h
avutil/common: Fix integer overflow in av_clip_uint8_c() and av_clip_uint16_c()
2018-02-17 15:56:55 +01:00
cpu_internal.h
Merge commit '4cf84e254ae75b524e1cacae499a97d7cc9e5906'
2018-02-11 23:08:48 -03:00
cpu.c
avutil: add AVX-512 flags
2017-12-24 22:02:41 +01:00
cpu.h
avutil: add AVX-512 flags
2017-12-24 22:02:41 +01:00
crc.c
crc: add AV_CRC_8_SBC as a 8 bits CRC with polynomial 0x1D
2018-03-07 22:26:53 +01:00
crc.h
crc: add AV_CRC_8_SBC as a 8 bits CRC with polynomial 0x1D
2018-03-07 22:26:53 +01:00
des.c
Merge commit 'a6a750c7ef240b72ce01e9653343a0ddf247d196'
2016-06-22 13:44:34 +02:00
des.h
avutil: undo FF_API_CRYPTO_CONTEXT deprecation
2015-10-16 19:13:38 -03:00
dict.c
avformat: factorize iso 8601 timestamp writer to a dictionary avutil function
2016-08-17 23:45:41 +02:00
dict.h
cosmetics: Fix spelling mistakes
2016-05-04 18:16:21 +02:00
display.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
display.h
Merge commit '075acbb6ff5740b2eea1bb7dd3afbc8e66e2ebf8'
2017-04-13 17:31:15 -03:00
downmix_info.c
…
downmix_info.h
…
dynarray.h
dynarray: Change AV_ to FF_ for AV_DYNARRAY_ADD
2016-07-31 10:19:03 -07:00
encryption_info.c
avcodec/avcodec.h: Add encryption info side data.
2018-03-24 03:11:08 +01:00
encryption_info.h
avformat/mov: Increase support for common encryption.
2018-04-19 03:15:32 +02:00
error.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
error.h
avutil/error: Introduce new error codes for 4XX and 5XX replies from remote servers
2014-10-19 22:32:14 +02:00
eval.c
Merge commit '97cfe1d8bd1968143e2ba9aa46ebe9504a835e24'
2017-11-01 20:05:09 -03:00
eval.h
avutil/eval: minor typo
2015-11-01 19:35:01 -05:00
ffmath.h
all: move ff_exp10, ff_exp10f, ff_fast_powf to lavu/ffmath.h
2016-03-22 10:15:31 -07:00
fifo.c
fifo: Return the correct AVERROR value
2017-01-26 10:25:20 +01:00
fifo.h
avutil/fifo: add function av_fifo_generic_peek_at()
2015-10-14 20:23:58 +02:00
file_open.c
Merge commit 'e41daa62465036ad36ad0bd14e4936e848d7f07e'
2017-11-11 10:22:11 -03:00
file.c
Merge commit '97cfe1d8bd1968143e2ba9aa46ebe9504a835e24'
2017-11-01 20:05:09 -03:00
file.h
avutil/file: Move av_tempfile() to avutil/file_open ff_tempfile()
2016-03-12 02:08:34 +01:00
fixed_dsp.c
x86/fixed_dsp: add ff_butterflies_fixed_sse2
2016-01-16 21:09:38 -03:00
fixed_dsp.h
x86/fixed_dsp: add ff_butterflies_fixed_sse2
2016-01-16 21:09:38 -03:00
float_dsp.c
avutil/float_dsp: add vector_dmac_scalar()
2017-04-10 12:04:14 +02:00
float_dsp.h
avutil/float_dsp: add vector_dmac_scalar()
2017-04-10 12:04:14 +02:00
frame.c
avutil/pixdesc: deprecate AV_PIX_FMT_FLAG_PSEUDOPAL
2018-04-03 17:53:00 +02:00
frame.h
lavu/frame: add QP side data
2018-03-18 12:36:24 +01:00
hash.c
avutil/crypto: change length parameter to size_t on the remaining modules
2018-02-15 11:21:28 -03:00
hash.h
avutil/crypto: change length parameter to size_t on the remaining modules
2018-02-15 11:21:28 -03:00
hmac.c
Merge commit '00b6a765430e5c5cacf0bd1be8b318d631cd4e14'
2017-05-05 13:27:03 +02:00
hmac.h
avutil/hmac: remove gap in AVHMACType enum values
2017-10-22 19:47:05 -03:00
hwcontext_cuda_internal.h
avutil/hwcontext_cuda: use dynamically loaded CUDA
2016-11-22 10:34:27 +01:00
hwcontext_cuda.c
avutil/hwcontext_cuda: use generic size and pointer assignment functions
2018-05-10 00:34:22 +02:00
hwcontext_cuda.h
avutil/hwcontext_cuda: add CUstream in cuda hwctx
2018-05-10 00:34:22 +02:00
hwcontext_d3d11va.c
Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'
2018-04-13 20:59:12 -03:00
hwcontext_d3d11va.h
hwcontext_d3d11va: add missing stdint.h include
2017-11-17 23:27:43 +01:00
hwcontext_drm.c
lavu: Add DRM hwcontext
2017-09-13 22:03:27 +01:00
hwcontext_drm.h
hwcontext_drm: Clarify value for unknown format modifiers
2018-03-22 23:18:53 +00:00
hwcontext_dxva2.c
Merge commit '8f144d9e3d5cb2ca92e5bdf7cc9f72effa1bd2ce'
2018-04-13 20:59:12 -03:00
hwcontext_dxva2.h
dxva: add support for new dxva2 and d3d11 hwaccel APIs
2017-06-27 18:05:02 +02:00
hwcontext_internal.h
lavu/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC
2017-12-16 00:52:00 +01:00
hwcontext_mediacodec.c
lavu/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC
2017-12-16 00:52:00 +01:00
hwcontext_mediacodec.h
lavu/hwcontext: add AV_HWDEVICE_TYPE_MEDIACODEC
2017-12-16 00:52:00 +01:00
hwcontext_opencl.c
hwcontext_opencl: Add support for mapping DRM objects to Beignet
2018-03-22 23:19:00 +00:00
hwcontext_opencl.h
lavu/hwcontext_opencl.h: fix build on macOS
2017-11-28 00:23:42 -06:00
hwcontext_qsv.c
Merge commit 'cca5e4f040971db6de0bfe6968f00c021d8a9c42'
2018-04-13 20:34:23 -03:00
hwcontext_qsv.h
Merge commit '59e7361cc791e5103be1712dc59a2055f118d0da'
2016-09-28 13:30:27 -03:00
hwcontext_vaapi.c
hwcontext_vaapi: Add an assert in vaapi_map_from_drm()
2018-05-10 19:52:53 +01:00
hwcontext_vaapi.h
hwcontext_vaapi: Try to support the VDPAU wrapper
2017-06-14 22:23:43 +01:00
hwcontext_vdpau.c
hwcontext_vdpau: implement av_hwdevice_get_hwframe_constraints()
2018-01-15 12:37:30 +01:00
hwcontext_vdpau.h
Merge commit 'a001ce31bc2bcf875a39b5fb22dae49120293b42'
2016-02-17 16:16:34 +00:00
hwcontext_videotoolbox.c
videotoolbox: add hwcontext support
2017-05-15 11:30:36 +02:00
hwcontext_videotoolbox.h
hwcontext_videotoolbox: fix fate-source
2017-05-15 18:50:04 +02:00
hwcontext.c
Merge commit '2eb396b175e55e515aa6a13c5b1789a2a18d3935'
2018-02-11 22:50:57 -03:00
hwcontext.h
hwcontext: Fix documentation for av_hwdevice_ctx_alloc()
2018-02-04 13:47:19 +00:00
imgutils_internal.h
Merge commit 'd7bc52bf456deba0f32d9fe5c288ec441f1ebef5'
2017-03-20 08:34:10 +01:00
imgutils.c
avutil/pixdesc: deprecate AV_PIX_FMT_FLAG_PSEUDOPAL
2018-04-03 17:53:00 +02:00
imgutils.h
Merge commit 'ce6d72d10776b03c6780d4aa676414ce002285d4'
2017-09-27 20:35:04 -03:00
integer.c
avutil/integer: move the test to the corresponding subdirectory
2018-03-20 23:27:58 -03:00
integer.h
…
internal.h
avutil/pixdesc: deprecate AV_PIX_FMT_FLAG_PSEUDOPAL
2018-04-03 17:53:00 +02:00
intfloat.h
…
intmath.c
intmath: remove av_ctz.
2015-10-11 18:03:10 -04:00
intmath.h
intmath: add faster clz support
2017-03-01 11:23:19 -05:00
intreadwrite.h
Merge commit '85e10c0a9321bfe0d2afe0f3983ab6a8df6e3fba'
2018-01-25 22:45:45 +00:00
lfg.c
libavutil: add av_lfg_init_from_data() function
2017-01-22 02:28:53 +01:00
lfg.h
libavutil: add av_lfg_init_from_data() function
2017-01-22 02:28:53 +01:00
libavutil.v
build: Change structure of the linker version script templates
2016-05-29 16:43:11 +02:00
libm.h
lavu/libm: add isfinite fallback
2016-01-13 20:00:19 -05:00
lls.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
lls.h
Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'
2016-01-02 10:25:12 +01:00
log2_tab.c
…
log.c
avutil/log: print level prefix also when no AVClass context is available
2018-03-16 09:08:17 +01:00
log.h
Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc'
2017-10-23 18:20:07 -03:00
lzo.c
avutil/lzo: split test out into a separate file
2016-05-13 22:48:56 -03:00
lzo.h
…
macros.h
Merge commit '50078c1c8070dd8d1c329e8117ff30ec72489039'
2016-01-02 10:25:12 +01:00
Makefile
avcodec/avcodec.h: Add encryption info side data.
2018-03-24 03:11:08 +01:00
mastering_display_metadata.c
lavu: add support for Content Light Level side metadata
2017-04-06 11:26:25 -03:00
mastering_display_metadata.h
avutil/mastering_display_metadata: fix copyright header wrongly formated as doxy
2018-01-11 11:35:51 -03:00
mathematics.c
lavu/mathematics: split closing bracket out of ifdefery
2017-03-18 23:50:05 +01:00
mathematics.h
mathematics: Extend and edit Doxygen
2016-08-02 21:53:34 -07:00
md5.c
avutil/md5: fix misaligned reads
2017-06-02 21:00:35 -04:00
md5.h
Merge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'
2017-05-05 13:04:38 +02:00
mem_internal.h
avutil/mem_internal: add missing header includes
2015-07-13 21:54:15 -03:00
mem.c
lavu/mem: Allow allocations close to max_alloc_size with av_fast_realloc().
2018-01-04 05:39:18 +01:00
mem.h
avutil/mem: Add DECLARE_ASM_ALIGNED macro for DJGPP architecture.
2017-12-02 19:14:09 +01:00
motion_vector.h
avutil/motion_vector: export subpel motion information
2015-11-23 10:55:15 +01:00
murmur3.c
avutil/crypto: change length parameter to size_t on the remaining modules
2018-02-15 11:21:28 -03:00
murmur3.h
avutil/crypto: change length parameter to size_t on the remaining modules
2018-02-15 11:21:28 -03:00
opt.c
lavu/opt: add AV_OPT_FLAG_DEPRECATED
2018-04-26 19:50:29 +02:00
opt.h
lavu/opt: add AV_OPT_FLAG_DEPRECATED
2018-04-26 19:50:29 +02:00
parseutils.c
avutil/parseutils: only accept full us duration, do not accept mss duration
2018-03-09 22:01:38 +01:00
parseutils.h
Merge commit '27f274628234c1f934b9a6a6380ed567c1b4ceae'
2015-04-07 20:46:25 +02:00
pca.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
pca.h
avutil/pca: Make argument of ff_pca_add() const
2014-09-28 16:17:18 +02:00
pixdesc.c
avutil: add gray14 pixel format
2018-05-05 21:35:31 +02:00
pixdesc.h
avutil/pixdesc: add AV_PIX_FMT_FLAG_ALPHA to AV_PIX_FMT_PAL8
2018-04-30 21:51:31 +02:00
pixelutils.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
pixelutils.h
…
pixfmt.h
avutil: add gray14 pixel format
2018-05-05 21:35:31 +02:00
qsort.h
all: Add missing header guards
2016-01-28 19:49:48 -08:00
random_seed.c
avutil/random_seed: use bcrypt instead of the old wincrypt API
2018-04-14 18:31:25 -03:00
random_seed.h
…
rational.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
rational.h
rational: Extend Doxygen
2016-08-02 21:52:40 -07:00
rc4.c
avutil: use EINVAL instead of -1 for the return code of crypto related init functions
2015-10-18 15:17:58 -04:00
rc4.h
avutil: undo FF_API_CRYPTO_CONTEXT deprecation
2015-10-16 19:13:38 -03:00
replaygain.h
Merge commit '29c2d06d67724e994980045afa055c6c34611b30'
2016-02-24 17:31:44 +00:00
reverse.c
avutil: add ff_reverse as av_reverse replacement
2015-08-12 00:14:14 +02:00
reverse.h
avutil/reverse: move the ff_reverse declaration to a separate header
2017-01-12 19:59:37 -03:00
ripemd.c
avutil/crypto: change length parameter to size_t on the remaining modules
2018-02-15 11:21:28 -03:00
ripemd.h
avutil/crypto: change length parameter to size_t on the remaining modules
2018-02-15 11:21:28 -03:00
samplefmt.c
swresample: add int64 sample format
2016-08-18 15:30:05 +02:00
samplefmt.h
swresample: add int64 sample format
2016-08-18 15:30:05 +02:00
sha512.c
lavu/sha512: update length argument following sha+md5 changes
2017-05-05 13:24:35 +02:00
sha512.h
lavu/sha512: update length argument following sha+md5 changes
2017-05-05 13:24:35 +02:00
sha.c
Merge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'
2017-05-05 13:04:38 +02:00
sha.h
Merge commit 'e435beb1ea5380a90774dbf51fdc8c941e486551'
2017-05-05 13:04:38 +02:00
slicethread.c
w32pthreads: always use Vista+ API, drop XP support
2017-12-26 02:49:48 +01:00
slicethread.h
avutil: merge slice threading implementation from avcodec and avfilter
2017-07-19 15:50:07 +07:00
softfloat_ieee754.h
avutil/softfloat_ieee754: make all functions inline
2016-11-05 17:53:26 -03:00
softfloat_tables.h
avutil/softfloat_tables: add missing stdint.h include
2015-04-30 17:38:41 -03:00
softfloat.h
avutil/softfloat: Add FLOAT_MIN
2017-11-05 22:13:16 +01:00
spherical.c
spherical: add functions to retrieve and request projection names
2017-04-27 09:59:54 -04:00
spherical.h
spherical: add functions to retrieve and request projection names
2017-04-27 09:59:54 -04:00
stereo3d.c
Merge commit 'fd9212f2edfe9b107c3c08ba2df5fd2cba5ab9e3'
2017-09-26 16:02:40 -03:00
stereo3d.h
Merge commit '99e9697e3a12ab4a6638a36b95edafd6a98f9eaa'
2017-11-29 21:06:49 -03:00
tablegen.h
libavutil/tablegen: add missing math.h include
2015-12-04 14:49:35 +01:00
tea.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
tea.h
Add support for TEA (Tiny Encryption Algorithm)
2015-07-21 23:10:44 +02:00
thread.h
lavc: replace and deprecate the lock manager
2017-12-26 02:50:00 +01:00
threadmessage.c
lavu/threadmessage: add av_thread_message_queue_nb_elems()
2018-04-26 19:41:19 +02:00
threadmessage.h
lavu/threadmessage: add av_thread_message_queue_nb_elems()
2018-04-26 19:41:19 +02:00
time_internal.h
avutil/time_internal: do not attempt to override *time_r() macros
2014-11-05 18:44:15 +01:00
time.c
avutil/tile: check clock_gettime at runtime for apple platforms
2017-01-09 11:52:06 +08:00
time.h
Merge commit '1bd0bdcdc236099d5c0d179696951f35f5310fa5'
2014-10-24 11:06:56 +02:00
timecode.c
avutil/timecode: fix starting frame number for 59.94 fps
2018-02-23 01:53:34 +01:00
timecode.h
lavu/timecode: Increase AV_TIMECODE_STR_SIZE.
2017-05-05 10:09:12 +02:00
timer.h
Merge commit 'b46900914a1f25ce8dbf49d7c53766ff1f18b60f'
2017-11-11 16:42:27 -03:00
timestamp.h
lavu/timestamp: Avoid C++-unfriendly code in user header
2016-09-01 20:01:28 +01:00
tree.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
tree.h
doc: fix spelling errors
2016-10-21 23:58:47 +02:00
twofish.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
twofish.h
libavutil: Added twofish symmetric block cipher
2015-01-29 01:56:11 +01:00
utils.c
lavc: drop VDA
2017-10-23 11:56:15 +02:00
version.h
avutil/hwcontext_cuda: add support for nvenc rgb formats
2018-05-10 00:34:22 +02:00
wchar_filename.h
Merge commit 'e41daa62465036ad36ad0bd14e4936e848d7f07e'
2017-11-11 10:22:11 -03:00
xga_font_data.c
…
xga_font_data.h
Merge commit 'abf1c058d1bd0ed1b820ea5e501a4484756f00b0'
2017-11-11 11:29:16 -03:00
xtea.c
Merge commit 'd12b5b2f135aade4099f4b26b0fe678656158c13'
2016-05-11 19:13:03 +01:00
xtea.h
Merge commit '588b6215b4c74945994eb9636b0699028c069ed2'
2015-11-22 14:29:09 +00:00