Skip to content

Commit 5a3224b

Browse files
committed
freeze native 4.5 releases
1 parent dc8f5b6 commit 5a3224b

File tree

1,138 files changed

+79014
-129126
lines changed

Some content is hidden

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

1,138 files changed

+79014
-129126
lines changed

.github/workflows/ios-build-scripts.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ jobs:
3838
- name: set up xcode
3939
run: echo "export DEVELOPER_DIR=/Applications/Xcode_${{ matrix.xcode }}.app/Contents/Developer" > ~/.xcode.for.ffmpeg.kit.sh
4040
- name: run the build script
41-
run: ./ios.sh --lts --enable-ios-audiotoolbox --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-videotoolbox --enable-ios-zlib
41+
run: ./ios.sh --lts --enable-ios-audiotoolbox --enable-ios-bzip2 --enable-ios-libiconv --enable-ios-zlib
4242
- name: print build logs
4343
if: ${{ always() }}
4444
run: cat build.log

README.md

+24-16
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
# FFmpegKit ![GitHub release](https://img.shields.io/badge/release-v4.4.LTS-blue.svg) ![Maven Central](https://img.shields.io/maven-central/v/com.arthenica/ffmpeg-kit-min) ![CocoaPods](https://img.shields.io/cocoapods/v/ffmpeg-kit-ios-min) [![Build Status](https://travis-ci.org/tanersener/ffmpeg-kit.svg?branch=master)](https://travis-ci.org/tanersener/ffmpeg-kit)
1+
# FFmpegKit ![GitHub release](https://img.shields.io/badge/release-v4.5-blue.svg) ![Maven Central](https://img.shields.io/maven-central/v/com.arthenica/ffmpeg-kit-min) ![CocoaPods](https://img.shields.io/cocoapods/v/ffmpeg-kit-ios-min)
22

33
FFmpeg Kit for applications.
44

@@ -8,7 +8,7 @@ FFmpeg Kit for applications.
88
- Scripts to build FFmpeg libraries
99
- `FFmpegKit` wrapper library to run `FFmpeg`/`FFprobe` commands in applications
1010
- Supports Android, iOS, macOS and tvOS
11-
- Based on FFmpeg `v4.4-dev` with optional system and external libraries
11+
- Based on FFmpeg `v4.5-dev` with optional system and external libraries
1212
- 8 prebuilt binary packages available at [Github](https://github.com/tanersener/ffmpeg-kit/releases), [Maven Central](https://search.maven.org) and [CocoaPods](https://cocoapods.org).
1313
- Licensed under `LGPL 3.0`, or `GPL v3.0` if GPL licensed libraries are enabled
1414

@@ -93,16 +93,20 @@ include them.
9393
</tbody>
9494
</table>
9595

96-
- `AVFoundation` is not available on `tvOS`, `VideoToolbox` is not available on `tvOS` LTS releases
96+
- `AVFoundation` is not available on `tvOS`
97+
- `VideoToolbox` is not available on LTS releases of `iOS` and `tvOS`
9798

9899
### 7. Versions
99100

100-
`FFmpegKit` binaries generated use the same major and minor version numbers as the upstream `FFmpeg` project. The exact
101-
version number is obtained using `git describe --tags`. `dev` part in `FFmpeg` version number indicates that `FFmpeg`
102-
source is cloned from the `FFmpeg` `master` branch.
101+
`FFmpegKit` binaries generated use the same major and minor version numbers as the upstream `FFmpeg` project.
102+
103+
The exact version number of `FFmpeg` is obtained using `git describe --tags`. `dev` part in the version string
104+
indicates that `FFmpeg` source code is cloned from the `FFmpeg` `master` branch.
103105

104106
| FFmpegKit Version | FFmpeg Version | Release Date |
105107
| :----: | :----: |:----: |
108+
| [4.5](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.5) | 4.5-dev-2008 | Sep 18, 2021 |
109+
| [4.5.LTS](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.5.LTS) | 4.5-dev-2008 | Sep 18, 2021 |
106110
| [4.4](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.4) | 4.4-dev-3015 | Mar 03, 2021 |
107111
| [4.4.LTS](https://github.com/tanersener/ffmpeg-kit/releases/tag/v4.4.LTS) | 4.4-dev-3015 | Mar 03, 2021 |
108112

@@ -121,34 +125,38 @@ This table shows the differences between two variants.
121125
| Android API Level | 24 | 16 |
122126
| Android Camera Access | Yes | - |
123127
| Android Architectures | arm-v7a-neon<br/>arm64-v8a<br/>x86<br/>x86-64 | arm-v7a<br/>arm-v7a-neon<br/>arm64-v8a<br/>x86<br/>x86-64 |
124-
| Xcode Compatibility | 11.0 or later | 9.0 or later |
125-
| iOS SDK | 12.1 | 11.0 |
128+
| iOS Min SDK | 12.1 | 9.3 |
129+
| iOS VideoToolbox | Yes | - |
126130
| iOS AVFoundation | Yes | - |
127131
| iOS Architectures | arm64<br/>arm64-simulator<br/>arm64-mac-catalyst<br/>x86-64<br/>x86-64-mac-catalyst | armv7<br/>arm64<br/>i386<br/>x86-64 |
128132
| iOS Bundle Format | XCFrameworks | Frameworks |
129-
| macOS SDK | 10.15 | 10.11 |
133+
| macOS Min SDK | 10.15 | 10.11 |
130134
| macOS AVFoundation | Yes | - |
131135
| macOS Architectures | arm64<br/>x86-64 | x86-64 |
132136
| macOS Bundle Format | XCFrameworks | Frameworks |
133-
| tvOS SDK | 11.0 | 9.2 |
137+
| tvOS Min SDK | 11.0 | 9.2 |
134138
| tvOS VideoToolbox | Yes | - |
135139
| tvOS Architectures | arm64<br/>x86-64<br/>arm64-simulator | arm64<br/>x86-64 |
136140
| tvOS Bundle Format | XCFrameworks | Frameworks |
137141

138-
### 9. Test Applications
142+
### 9. Documentation
143+
144+
A more detailed documentation is available under [Wiki](https://github.com/tanersener/ffmpeg-kit/wiki).
145+
146+
### 10. Test Applications
139147

140148
You can see how `FFmpegKit` is used inside an application by running test applications created under
141149
[FFmpegKit Test](https://github.com/tanersener/ffmpeg-kit-test) project.
142150

143151
All applications are identical and supports command execution, video encoding, accessing https urls, encoding audio,
144-
burning subtitles, video stabilisation, pipe operations, concurrent command execution.
152+
burning subtitles, video stabilisation, pipe operations and concurrent command execution.
145153

146-
### 10. License
154+
### 11. License
147155

148156
`FFmpegKit` is licensed under the `LGPL v3.0`. However, if source code is built using the optional `--enable-gpl` flag
149157
or prebuilt binaries with `-gpl` postfix are used, then `FFmpegKit` is subject to the `GPL v3.0` license.
150158

151-
### 11. Patents
159+
### 12. Patents
152160

153161
It is not clearly explained in their documentation, but it is believed that `FFmpeg`, `kvazaar`, `x264` and `x265`
154162
include algorithms which are subject to software patents. If you live in a country where software algorithms are
@@ -159,15 +167,15 @@ that you seek legal advice first. See [FFmpeg Patent Mini-FAQ](https://ffmpeg.or
159167
distribute that library, then you are subject to pay MPEG LA licensing fees. Refer to
160168
[OpenH264 FAQ](https://www.openh264.org/faq.html) page for the details.
161169

162-
### 12. Contributing
170+
### 13. Contributing
163171

164172
Feel free to submit issues or pull requests.
165173

166174
Please note that `main` includes only the latest released source code. Changes planned for the next release are
167175
developed under the `development` branch. Therefore, if you want to create a pull request, please open it against
168176
the `development`.
169177

170-
### 13. See Also
178+
### 14. See Also
171179

172180
- [FFmpeg API Documentation](https://ffmpeg.org/doxygen/4.0/index.html)
173181
- [FFmpeg Wiki](https://trac.ffmpeg.org/wiki/WikiStart)

android/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ All libraries created by `android.sh` can be found under the `prebuilt` director
7777
}
7878
7979
dependencies {
80-
implementation 'com.arthenica:ffmpeg-kit-full:4.4.LTS'
80+
implementation 'com.arthenica:ffmpeg-kit-full:4.5'
8181
}
8282
```
8383

android/build.gradle

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ buildscript {
44
jcenter()
55
}
66
dependencies {
7-
classpath 'com.android.tools.build:gradle:4.1.2'
7+
classpath 'com.android.tools.build:gradle:4.2.2'
88
}
99
}
1010

android/ffmpeg-kit-android-lib/Doxyfile

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

41-
PROJECT_NUMBER = 4.4
41+
PROJECT_NUMBER = 4.5
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/ffmpeg-kit-android-lib/build.gradle

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ apply plugin: 'com.android.library'
22

33
android {
44
compileSdkVersion 30
5-
ndkVersion "22.0.7026061"
5+
ndkVersion "23.0.7599858"
66

77
defaultConfig {
88
minSdkVersion 24
99
targetSdkVersion 30
10-
versionCode 240440
11-
versionName "4.4"
10+
versionCode 240450
11+
versionName "4.5"
1212
project.archivesBaseName = "ffmpeg-kit"
1313
consumerProguardFiles 'proguard-rules.pro'
1414
}

android/ffmpeg-kit-android-lib/src/main/cpp/ffmpegkit.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@
2727
#include "libavutil/ffversion.h"
2828

2929
/** Library version string */
30-
#define FFMPEG_KIT_VERSION "4.4"
30+
#define FFMPEG_KIT_VERSION "4.5"
3131

3232
/** Defines tag used for Android logging. */
3333
#define LIB_NAME "ffmpeg-kit"

android/ffmpeg-kit-android-lib/src/main/java/com/arthenica/ffmpegkit/NativeLoader.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -82,7 +82,7 @@ static String loadPackageName() {
8282
}
8383

8484
static String loadVersion() {
85-
final String version = "4.4";
85+
final String version = "4.5";
8686

8787
if (isTestModeDisabled()) {
8888
return FFmpegKitConfig.getVersion();

apple/Doxyfile

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

41-
PROJECT_NUMBER = 4.4
41+
PROJECT_NUMBER = 4.5
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

apple/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -114,17 +114,17 @@ All libraries created can be found under the `prebuilt` directory.
114114

115115
- iOS
116116
```
117-
pod 'ffmpeg-kit-ios-full', '~> 4.4.LTS'
117+
pod 'ffmpeg-kit-ios-full', '~> 4.5'
118118
```
119119
120120
- macOS
121121
```
122-
pod 'ffmpeg-kit-macos-full', '~> 4.4.LTS'
122+
pod 'ffmpeg-kit-macos-full', '~> 4.5'
123123
```
124124
125125
- tvOS
126126
```
127-
pod 'ffmpeg-kit-tvos-full', '~> 4.4.LTS'
127+
pod 'ffmpeg-kit-tvos-full', '~> 4.5'
128128
```
129129
130130
2. Execute synchronous `FFmpeg` commands.

apple/src/FFmpegKitConfig.m

+1-1
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
#import "SessionState.h"
3636

3737
/** Global library version */
38-
NSString* const FFmpegKitVersion = @"4.4";
38+
NSString* const FFmpegKitVersion = @"4.5";
3939

4040
/**
4141
* Prefix of named pipes created by ffmpeg-kit.

docs/android/doc/html/annotated.html

+11-12
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@
22
<html xmlns="http://www.w3.org/1999/xhtml">
33
<head>
44
<meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
5-
<meta http-equiv="X-UA-Compatible" content="IE=9"/>
6-
<meta name="generator" content="Doxygen 1.9.1"/>
5+
<meta http-equiv="X-UA-Compatible" content="IE=11"/>
6+
<meta name="generator" content="Doxygen 1.9.2"/>
77
<meta name="viewport" content="width=device-width, initial-scale=1"/>
88
<title>FFmpegKit Android API: Data Structures</title>
99
<link href="tabs.css" rel="stylesheet" type="text/css"/>
@@ -22,30 +22,30 @@
2222
<tr style="height: 56px;">
2323
<td id="projectlogo"><img alt="Logo" src="ffmpeg-kit-icon-v9-small.png"/></td>
2424
<td id="projectalign" style="padding-left: 0.5em;">
25-
<div id="projectname">FFmpegKit Android API
26-
&#160;<span id="projectnumber">4.4</span>
25+
<div id="projectname">FFmpegKit Android API<span id="projectnumber">&#160;4.5</span>
2726
</div>
2827
</td>
2928
</tr>
3029
</tbody>
3130
</table>
3231
</div>
3332
<!-- end header part -->
34-
<!-- Generated by Doxygen 1.9.1 -->
33+
<!-- Generated by Doxygen 1.9.2 -->
3534
<script type="text/javascript">
36-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
37-
var searchBox = new SearchBox("searchBox", "search",false,'Search','.html');
35+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
36+
var searchBox = new SearchBox("searchBox", "search",'Search','.html');
3837
/* @license-end */
3938
</script>
4039
<script type="text/javascript" src="menudata.js"></script>
4140
<script type="text/javascript" src="menu.js"></script>
4241
<script type="text/javascript">
43-
/* @license magnet:?xt=urn:btih:cf05388f2679ee054f2beb29a391d25f4e673ac3&amp;dn=gpl-2.0.txt GPL-v2 */
42+
/* @license magnet:?xt=urn:btih:d3d9a9a6595521f9666a5e94cc830dab83b65699&amp;dn=expat.txt MIT */
4443
$(function() {
4544
initMenu('',true,false,'search.php','Search');
4645
$(document).ready(function() { init_search(); });
4746
});
48-
/* @license-end */</script>
47+
/* @license-end */
48+
</script>
4949
<div id="main-nav"></div>
5050
</div><!-- top -->
5151
<!-- window showing the filter options -->
@@ -63,8 +63,7 @@
6363
</div>
6464

6565
<div class="header">
66-
<div class="headertitle">
67-
<div class="title">Data Structures</div> </div>
66+
<div class="headertitle"><div class="title">Data Structures</div></div>
6867
</div><!--header-->
6968
<div class="contents">
7069
<div class="textblock">Here are the data structures with brief descriptions:</div><div class="directory">
@@ -108,7 +107,7 @@
108107
</div><!-- contents -->
109108
<!-- start footer part -->
110109
<hr class="footer"/><address class="footer"><small>
111-
Generated on Mon Mar 1 2021 23:46:51 for FFmpegKit Android API by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.1
110+
Generated on Sat Sep 18 2021 14:51:02 for FFmpegKit Android API by&#160;<a href="https://www.doxygen.org/index.html"><img class="footer" src="doxygen.svg" width="104" height="31" alt="doxygen"/></a> 1.9.2
112111
</small></address>
113112
</body>
114113
</html>

0 commit comments

Comments
 (0)