Merge branch 'master' into development

ffmpeg_4.4.2
Javernaut 5 years ago
commit fcfddd20eb
  1. 1
      README.md

@ -1,5 +1,6 @@
# ffmpeg-android-maker
[![Codacy Badge](https://api.codacy.com/project/badge/Grade/6b9a9fe4c6874e65a5e2a3f9beb15605)](https://app.codacy.com/manual/Javernaut/ffmpeg-android-maker?utm_source=github.com&utm_medium=referral&utm_content=Javernaut/ffmpeg-android-maker&utm_campaign=Badge_Grade_Dashboard)
[![Build Status](https://travis-ci.org/Javernaut/ffmpeg-android-maker.svg?branch=master)](https://travis-ci.org/Javernaut/ffmpeg-android-maker)
[![Android Weekly #378](https://androidweekly.net/issues/issue-378/badge)](https://androidweekly.net/issues/issue-378)
[![Android Weekly #396](https://androidweekly.net/issues/issue-396/badge)](https://androidweekly.net/issues/issue-396)

Loading…
Cancel
Save