Merge branch 'master' into develop

This commit is contained in:
Jerome Wu 2019-10-25 19:07:48 +08:00
commit b0c53f83b8

View File

@ -1,7 +1,7 @@
FFmpeg.js
=========
[![Actions Status](https://github.com/jeromewu/ffmpeg.js/workflows/CI/badge.svg)](https://github.com/jeromewu/ffmpeg.js/actions)
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/jeromewu/ffmpeg.js/graphs/commit-activity)
[![Actions Status](https://github.com/ffmpegjs/ffmpeg.js/workflows/CI/badge.svg)](https://github.com/ffmpegjs/ffmpeg.js/actions)
[![Maintenance](https://img.shields.io/badge/Maintained%3F-yes-green.svg)](https://github.com/ffmpegjs/ffmpeg.js/graphs/commit-activity)
[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](https://opensource.org/licenses/MIT)
[![Code Style](https://badgen.net/badge/code%20style/airbnb/ff5a5f?icon=airbnb)](https://github.com/airbnb/javascript)
[![Downloads Total](https://img.shields.io/npm/dt/@ffmpeg/ffmpeg.svg)](https://www.npmjs.com/package/@ffmpeg/ffmpeg)