Skip to content
This repository has been archived by the owner on Oct 7, 2021. It is now read-only.

Commit

Permalink
Merged v2.1.1
Browse files Browse the repository at this point in the history
  • Loading branch information
tanersener committed Sep 16, 2018
1 parent 5a7bd1a commit 48b0933
Show file tree
Hide file tree
Showing 493 changed files with 4,340 additions and 3,527 deletions.
8 changes: 4 additions & 4 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# MobileFFmpeg [![Join the chat at https://gitter.im/mobile-ffmpeg/Lobby](https://badges.gitter.im/mobile-ffmpeg/Lobby.svg)](https://gitter.im/mobile-ffmpeg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![GitHub release](https://img.shields.io/badge/release-v2.1-blue.svg) ![Bintray](https://img.shields.io/badge/bintray-v2.1-blue.svg) ![CocoaPods](https://img.shields.io/badge/pod-v2.1.1-blue.svg)
# MobileFFmpeg [![Join the chat at https://gitter.im/mobile-ffmpeg/Lobby](https://badges.gitter.im/mobile-ffmpeg/Lobby.svg)](https://gitter.im/mobile-ffmpeg/Lobby?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) ![GitHub release](https://img.shields.io/badge/release-v2.1.1-blue.svg) ![Bintray](https://img.shields.io/badge/bintray-v2.1.1-blue.svg) ![CocoaPods](https://img.shields.io/badge/pod-v2.1.1-blue.svg)

FFmpeg for Android and IOS

Expand Down Expand Up @@ -53,7 +53,7 @@ There are eight different prebuilt packages. Below you can see which external li
1. Add MobileFFmpeg dependency from `jcenter()`
```
dependencies {`
implementation 'com.arthenica:mobile-ffmpeg-full:2.1'
implementation 'com.arthenica:mobile-ffmpeg-full:2.1.1'
}
```
Expand Down Expand Up @@ -102,7 +102,7 @@ There are eight different prebuilt packages. Below you can see which external li
7. Register custom fonts directory.
```
Config.setFontDirectory(this, "fonts", Collections.EMPTY_MAP);
Config.setFontDirectory(this, "<folder with fonts>", Collections.EMPTY_MAP);
```
#### 2.2 IOS
Expand Down Expand Up @@ -160,7 +160,7 @@ There are eight different prebuilt packages. Below you can see which external li
7. Register custom fonts directory.
```
[MobileFFmpegConfig setFontDirectory:@"fonts" with:nil];
[MobileFFmpegConfig setFontDirectory:@"<folder with fonts>" with:nil];
```
#### 2.3 Test Application
Expand Down
2 changes: 1 addition & 1 deletion android/app/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ PROJECT_NAME = "MobileFFmpeg Android API"
# could be handy for archiving the generated documentation or if some version
# control system is used.

PROJECT_NUMBER = 2.1
PROJECT_NUMBER = 2.1.1

# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
Expand Down
2 changes: 1 addition & 1 deletion android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ android {
minSdkVersion 21
targetSdkVersion 27
versionCode 21
versionName "2.1"
versionName "2.1.1"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
project.archivesBaseName = "mobile-ffmpeg"
}
Expand Down
Loading

0 comments on commit 48b0933

Please sign in to comment.