Commit Graph

  • *
  • *
  • |\
  • * \
  • |\ \
  • * \ \
  • |\ \ \
  • * \ \ \
  • |\ \ \ \
  • * \ \ \ \
  • |\ \ \ \ \
  • | | | | | | *
  • | | | | | | | *
  • * | | | | | | |
  • * | | | | | | |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • | | | | | | * |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • * | | | | | | |
  • | | | | | | | | *
  • | | | | | | | | *
  • | | | | | | | | *
  • | | | | | | | | *
  • | | | | | | | | *
  • | | | | | | | | *
  • | | | | | | | | *
  • * | | | | | | | |
  • |\ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \
  • * | | | | | | | | | |
  • * | | | | | | | | | |
  • * | | | | | | | | | |
  • * | | | | | | | | | |
  • * | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \
  • * | | | | | | | | | | | | |
  • * | | | | | | | | | | | | |
  • * | | | | | | | | | | | | |
  • * | | | | | | | | | | | | |
  • * | | | | | | | | | | | | |
  • * | | | | | | | | | | | | |
  • * | | | | | | | | | | | | |
  • | | | | | | | | | | | | | *
  • | | | | | | | | | | | | | *
  • * | | | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • | | | | | | | | | | | | | | | | | *
  • * | | | | | | | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * | | | | | | | | | | | | | | | | | | | | | | | | |
  • * | | | | | | | | | | | | | | | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * | | | | | | | | | | | | | | | | | | | | | | | | | | |
  • * | | | | | | | | | | | | | | | | | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * | | | | | | | | | | | | | | | | | | | | | | | | | | | |
  • * | | | | | | | | | | | | | | | | | | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
  • * | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | |
  • |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
  • c64800e976 configure: add optional zlib dependency to avformat by James Almer 2017-10-26 15:27:57 -0300
  • 4bb09bf5a0 Merge commit '604fbb3132e88727e496c96c92cfe02748c25a1a' by James Almer 2017-10-26 14:50:36 -0300
  • 4576ee100b Merge commit '3d197514e613ccd9eab43180c0a7c8b09a307606' by James Almer 2017-10-26 14:45:36 -0300
  • 4c0426c478 Merge commit '0cf949a01193dcf6f83fd95d46792dd94479b4e4' by James Almer 2017-10-26 14:38:14 -0300
  • b848eb8347 Merge commit 'f64d1100a54d12c78ce436181bb64229c56da6b3' by James Almer 2017-10-26 14:11:45 -0300
  • 5de85c1029 Merge commit '10f4511f14a4e830c0ed471df4cd1cc2a18a481a' by James Almer 2017-10-26 14:06:34 -0300
  • 670d3189e9 (tag: n3.3.5) avformat/id3v2: fix leak in chapter parsing by Fredrik Hubinette 2017-02-07 12:19:38 -0800
  • 479e65ba47 Update for 3.0.10 by Michael Niedermayer 2017-10-26 18:48:41 +0200
  • a4743d2574 avformat/yuv4mpeg: add gray9/10/12 support by Mateusz 2017-10-07 19:05:53 +0200
  • f2c867051c lavc/avcodec: Constify the return value of av_bitstream_filter_next(). by Carl Eugen Hoyos 2017-10-26 18:29:02 +0200
  • 60b385a5bf Update for 3.3.5 by Michael Niedermayer 2017-10-26 17:36:17 +0200
  • b33434ec62 tests/ffserver.regression.ref: update checksums to what ffserver currently produces by Michael Niedermayer 2017-10-22 17:11:21 +0200
  • 0ccb27e094 ffserver: Fix off by 1 error in path by Michael Niedermayer 2017-10-22 17:11:20 +0200
  • e8fd32b69f avcodec/snowdec: Check mv_scale by Michael Niedermayer 2017-10-13 03:06:54 +0200
  • 20fd9217d8 avcodec/pafvideo: Check for bitstream end in decode_0() by Michael Niedermayer 2017-10-13 03:06:53 +0200
  • 48933f28c2 avcodec/ffv1dec: Fix out of array read in slice counting by Michael Niedermayer 2017-10-09 11:49:28 +0200
  • d13d3feba2 avcodec/dirac_dwt: Fix integer overflow in COMPOSE_53iL0() by Michael Niedermayer 2017-10-09 01:46:28 +0200
  • aa6c44c333 avcodec/mpeg_er: Clear mcsel in mpeg_er_decode_mb() by Michael Niedermayer 2017-10-09 00:32:30 +0200
  • 0009272f94 avcodec/mpeg4videodec: Use 64 bit intermediates for sprite delta by Michael Niedermayer 2017-10-08 21:41:54 +0200
  • 7cc854ce15 avcodec/x86/lossless_videoencdsp: Fix warning: signed dword value exceeds bounds by Michael Niedermayer 2017-09-30 00:26:51 +0200
  • 0a231e7dd3 avcodec/x86/lossless_videoencdsp: Fix handling of small widths by Michael Niedermayer 2017-09-30 00:20:09 +0200
  • ab43bc50c0 avcodec/truemotion2: Fix integer overflows in tm2_high_chroma() by Michael Niedermayer 2017-09-30 18:54:06 +0200
  • 4768b30b5b avcodec/aacdec_template: Clear tns present flag on error by Michael Niedermayer 2017-09-30 18:54:05 +0200
  • 6b9ffcdb2b avcodec/proresdec2: SKIP_BITS() does not work with len=32 by Michael Niedermayer 2017-10-02 04:18:22 +0200
  • 520daf8c0e avcodec/hevcdsp_template: Fix undefined shift by Michael Niedermayer 2017-10-02 04:18:21 +0200
  • c54317a17e avcodec/jpeg2000: Check that codsty->log2_prec_widths/heights has been initialized by Michael Niedermayer 2017-09-04 22:23:26 +0200
  • ab845587d1 avcodec/takdec: Fix integer overflow in decode_lpc() by Michael Niedermayer 2017-09-22 20:45:27 +0200
  • 4bc16930ef avcodec/proresdec2: Check bits in DECODE_CODEWORD(), fixes invalid shift by Michael Niedermayer 2017-09-22 20:45:28 +0200
  • b5b52c0ca7 avcodec/takdec: Fix integer overflows in decode_subframe() by Michael Niedermayer 2017-09-22 20:45:26 +0200
  • 940659036f avcodec/dirac_dwt: Fix integer overflow in COMPOSE_FIDELITYi*() by Michael Niedermayer 2017-09-18 02:53:25 +0200
  • 6d1ebb9def avcodec/ffv1dec: Fix integer overflow in read_quant_table() by Michael Niedermayer 2017-09-18 17:26:09 +0200
  • 4e341bd904 avcodec/svq3: Fix overflow in svq3_add_idct_c() by Michael Niedermayer 2017-09-18 17:03:55 +0200
  • bf6cd808be avcodec/pngdec: Clean up on av_frame_ref() failure by Michael Niedermayer 2017-09-17 02:42:11 +0200
  • a07ac93023 avformat/wavenc: skip writing incorrect peak-of-peaks position value by Tobias Rapp 2017-09-29 16:32:20 +0200
  • ae100046ca avcodec/exif: remove GetByteContext usage from avpriv_exif_decode_ifd() by James Almer 2017-10-23 23:39:54 -0300
  • 6bd665b7c5 avcodec/tak: remove GetBitContext usage from avpriv_tak_parse_streaminfo() by James Almer 2017-10-22 20:29:53 -0300
  • 984b882b76 fate: fix mpeg2-ticket6677 faillures on some platforms by Zhong Li 2017-10-25 13:45:22 +0800
  • 50ce296026 swscale: use dithering in DITHER_COPY only if not set -sws_dither none by Mateusz 2017-10-24 10:02:17 +0200
  • 736a48901f avcodec/mips: Improve hevc bi weighted hv mc msa functions by Kaustubh Raste 2017-10-24 12:41:30 +0530
  • ce0a52e9e9 avcodec/mips: Improve avc chroma copy and avg vert mc msa functions by Kaustubh Raste 2017-10-24 12:40:42 +0530
  • 2aab7c2dfa avcodec/mips: Improve avc put mc 11, 31, 13 and 33 msa functions by Kaustubh Raste 2017-10-24 12:38:30 +0530
  • c23209f63d tools/target_dec_fuzzer: Fix build after AV_CODEC_CAP_HWACCEL_VDPAU was removed by Michael Niedermayer 2017-10-25 19:27:29 +0200
  • e6debcaaed tools/target_dec_fuzzer: Fix build after FF_INPUT_BUFFER_PADDING_SIZE was removed by Michael Niedermayer 2017-10-25 19:26:58 +0200
  • 50e30d9bb7 Don't use _tzcnt instrinics with clang for windows w/o BMI. by Dale Curtis 2017-10-24 13:03:59 -0700
  • 9dc79b2943 configure: Drop support for legacy PGI compiler by Diego Biurrun 2017-10-06 02:24:25 +0200
  • 0af8a72174 build: Drop support for legacy TI ARM compiler by Diego Biurrun 2017-09-24 14:24:02 +0200
  • 2708c8e8ef hwcontext_vaapi: Set message callbacks on internally-created devices by Mark Thompson 2017-10-01 22:51:31 +0100
  • bfc83acfd6 vaapi: Always free parameter buffers after vaEndPicture() with libva2 by Mark Thompson 2017-10-01 22:51:20 +0100
  • f0a978a519 vaapi: Remove H.264 baseline profile by Mark Thompson 2017-10-01 22:51:13 +0100
  • a126b67e1b configure: Add config option for libva2 (VAAPI 1) by Mark Thompson 2017-10-01 22:51:07 +0100
  • 94ab0bef40 vaapi: Disable deprecation warnings around use of struct vaapi_context by Mark Thompson 2017-10-01 22:50:59 +0100
  • 953d55f443 Merge commit '26d9b60373bf45bc4f91ff6815f5fa36764d4d7b' by James Almer 2017-10-24 19:26:29 -0300
  • d289f3febd Merge commit '163cc67beb3ed28aeb500c9a09df47c8df613025' by James Almer 2017-10-24 19:25:05 -0300
  • 7e294a1f09 fate: add a test for mpeg2 issue of ticket #6677 by Zhong Li 2017-10-23 15:18:12 +0800
  • 431eccd61e tests/ffserver.regression.ref: update checksums to what ffserver currently produces by Michael Niedermayer 2017-10-22 17:11:21 +0200
  • 617f0c65e1 ffserver: Fix off by 1 error in path by Michael Niedermayer 2017-10-22 17:11:20 +0200
  • c8c995bc1d libopus: Add channel mapping 2 support in libopusdec by Felicia Lim 2017-03-27 16:21:20 -0700
  • 6821b693ec Merge commit '5a969f64b9cf40bad923c73b66c3031b0018e848' by James Almer 2017-10-24 19:17:02 -0300
  • 4e9dc52a97 Merge commit '1bd986ed4b0e95ded368a8eeb5c044853c090f9b' by James Almer 2017-10-24 19:14:22 -0300
  • c0683dce89 Merge commit '0b9a237b2386ff84a6f99716bd58fa27a1b767e7' by James Almer 2017-10-24 19:10:22 -0300
  • 59b00ffea3 cbs_h264: Fix format specifier by Mark Thompson 2017-10-24 22:58:47 +0100
  • 79d666aa57 cbs_mpeg2: Fix format specifier by Mark Thompson 2017-10-24 22:57:44 +0100
  • 5b2c71bb94 cbs_mpeg2: Fix type for marker_bit reading by Mark Thompson 2017-10-24 22:56:48 +0100
  • f31478ba14 lavc/vaapi_encode_h264: correct VUI max_dec_frame_buffering setting by Jun Zhao 2017-10-24 13:25:21 +0800
  • 6e16547685 lavc/dvbsub: Add the missing line separator to dvb_encode_rle8(). by Carl Eugen Hoyos 2017-10-24 22:49:04 +0200
  • df95f145be lavc/dvbsub: Do not fail hard in the region block for 256-colour encoding. by JULIAN GARDNER 2017-10-24 22:46:00 +0200
  • 3c14547eb7 lavfi/tests/filtfmts: Constify a variable. by Carl Eugen Hoyos 2017-10-24 22:32:59 +0200
  • b487add7ec arm: Remove a redundant check in fmtconvert_init_arm.c by Martin Storsjö 2017-10-23 10:44:53 +0300
  • 17f5171cd4 arm: Check for have_vfp_vm instead of !have_vfpv3 for float_dsp_vfp by Martin Storsjö 2017-10-23 10:44:07 +0300
  • acf70639fb Merge commit '75ef91543422049a01b594925fcdb182ea12eb09' by James Almer 2017-10-23 20:46:55 -0300
  • ce1b1f00bd Merge commit 'fe6eea99efac66839052af547426518efd970b24' by James Almer 2017-10-23 19:58:04 -0300
  • cd541de9dc Merge commit 'd4f3c26b700ae847433ba3c67dc99c32bc1fd4a1' by James Almer 2017-10-23 19:54:45 -0300
  • 4e6c85b3ba Merge commit 'd6390090c4dbd766b77353553d9cb4fb4fb41ebd' by James Almer 2017-10-23 19:42:23 -0300
  • e724bdfffb lavc: fix hw_device_ctx operation by wm4 2017-10-24 00:28:03 +0200
  • a60fb1f88f Merge commit '083ea8768121ee800893e124b08483011b798919' by James Almer 2017-10-23 19:17:31 -0300
  • 6a426693cc Merge commit '8c616b3b8996bd4f9b117496b66b16cc625d7d24' by James Almer 2017-10-23 19:14:20 -0300
  • 0acb18d298 Merge commit '883ce264d9ffc5bdaf477e09ee155b03339c46a6' by James Almer 2017-10-23 18:51:34 -0300
  • 69bb3f7bff Merge commit '3f128fc4a3fa1ef8a87974eb5484a997a84868fe' by James Almer 2017-10-23 18:49:22 -0300
  • 2f4677a11f Merge commit '5f90ad99bb7e53383fefab5107b861e4c4600700' by James Almer 2017-10-23 18:46:28 -0300
  • 572b7a0b85 Merge commit '35cf146a33ce41a1adb6c9bd5a0827eacb1b6bfc' by James Almer 2017-10-23 18:20:07 -0300
  • c0cfc0ce11 Merge commit '619a433eca2c5655c41b799e0b06380020fb1498' by James Almer 2017-10-23 18:18:00 -0300
  • b773a8d8c1 Merge commit 'dd343fd986459f467a2d1d70c26101dff1d47d68' by James Almer 2017-10-23 18:15:49 -0300
  • f192f2f061 swscale: more accurate DITHER_COPY macro for full and limited range by Mateusz 2017-10-06 16:49:54 +0200
  • c17f638565 Merge commit '0648dec19db83bc8c87814d195e32cbad5698a40' by James Almer 2017-10-23 17:23:43 -0300
  • bfab430856 Merge commit '94eed68ace9f2416af8457fcbf142b175928c06b' by James Almer 2017-10-23 17:06:05 -0300
  • fb41bad7e0 avodec/vaapi: drop deprecated vaapi_context fields by James Almer 2017-10-23 17:00:06 -0300
  • 3e0a16f003 Merge commit 'c43a96fe16e6a6ea091e64ca271f0788f4a0bea9' by James Almer 2017-10-23 16:56:18 -0300
  • eb5f846339 avcodec: drop deprecated vismv option by James Almer 2017-10-23 16:52:24 -0300
  • d2484639bc Merge commit '48bb0da050329e5111b00a12dfc154b7e78fb3a3' by James Almer 2017-10-23 16:37:30 -0300
  • 2ccd00dabd Merge commit '5182a28b5de060c51c21b36053ab205bfbbbbe31' by James Almer 2017-10-23 16:31:50 -0300
  • 5a2e581879 Merge commit '4476027d93680cd88d2f75ef1cef5b0c276a8704' by James Almer 2017-10-23 16:28:38 -0300
  • b79a7da36f Merge commit 'bb45d11282d93af0e8d4c8fd6bc6405f7439a940' by James Almer 2017-10-23 16:19:38 -0300
  • 6e69525e69 Merge commit '302554835e39b79b977ed60c9afe81b44590dfef' by James Almer 2017-10-23 16:08:42 -0300
  • 7b550c5f84 Merge commit 'b3739599bda740ac12d3dde31a331b744df99123' by James Almer 2017-10-23 16:04:31 -0300
  • d658e04337 Merge commit '06c20d3e32c33c4da6d9fbc43aebaeb38c45b859' by James Almer 2017-10-23 16:00:30 -0300
  • f7eb1c9ac5 Merge commit 'da5ba26b9e25f408e8d2f9428c9eca699f11a7db' by James Almer 2017-10-23 15:59:02 -0300
  • 0b79fdeb9a Merge commit 'cbebc3251bc2544b469e0dcb176bc04779d8866c' by James Almer 2017-10-23 15:56:29 -0300
  • 400ecd8e40 Merge commit '72dc7ddd18fe54ee68aec71590c3202ad009a8fc' by James Almer 2017-10-23 15:50:46 -0300
  • 7bbe33b052 avcodec/libx264: add me_method alias to set X264Context->motion_est by James Almer 2017-10-23 14:34:15 -0300
  • b46613dd9b Merge commit 'dcc39ee10e82833ce24aa57926c00ffeb1948198' by James Almer 2017-10-23 15:11:42 -0300