Skip to content
This repository was archived by the owner on Jan 6, 2025. It is now read-only.

Commit 48b0933

Browse files
committed
Merged v2.1.1
1 parent 5a7bd1a commit 48b0933

File tree

493 files changed

+4340
-3527
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

493 files changed

+4340
-3527
lines changed

README.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# 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)
1+
# 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)
22

33
FFmpeg for Android and IOS
44

@@ -53,7 +53,7 @@ There are eight different prebuilt packages. Below you can see which external li
5353
1. Add MobileFFmpeg dependency from `jcenter()`
5454
```
5555
dependencies {`
56-
implementation 'com.arthenica:mobile-ffmpeg-full:2.1'
56+
implementation 'com.arthenica:mobile-ffmpeg-full:2.1.1'
5757
}
5858
```
5959
@@ -102,7 +102,7 @@ There are eight different prebuilt packages. Below you can see which external li
102102
103103
7. Register custom fonts directory.
104104
```
105-
Config.setFontDirectory(this, "fonts", Collections.EMPTY_MAP);
105+
Config.setFontDirectory(this, "<folder with fonts>", Collections.EMPTY_MAP);
106106
```
107107
108108
#### 2.2 IOS
@@ -160,7 +160,7 @@ There are eight different prebuilt packages. Below you can see which external li
160160
161161
7. Register custom fonts directory.
162162
```
163-
[MobileFFmpegConfig setFontDirectory:@"fonts" with:nil];
163+
[MobileFFmpegConfig setFontDirectory:@"<folder with fonts>" with:nil];
164164
```
165165
166166
#### 2.3 Test Application

android/app/Doxyfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ PROJECT_NAME = "MobileFFmpeg Android API"
3838
# could be handy for archiving the generated documentation or if some version
3939
# control system is used.
4040

41-
PROJECT_NUMBER = 2.1
41+
PROJECT_NUMBER = 2.1.1
4242

4343
# Using the PROJECT_BRIEF tag one can provide an optional one line description
4444
# for a project that appears at the top of each page and should give viewer a

android/app/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ android {
66
minSdkVersion 21
77
targetSdkVersion 27
88
versionCode 21
9-
versionName "2.1"
9+
versionName "2.1.1"
1010
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
1111
project.archivesBaseName = "mobile-ffmpeg"
1212
}

0 commit comments

Comments
 (0)