Skip to content

Commit bba2b62

Browse files
committed
use ffmpeg n5.1.1
1 parent 2485467 commit bba2b62

Some content is hidden

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

69 files changed

+12075
-9894
lines changed

android.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ echo -e "\nINFO: Using Android NDK v${DETECTED_NDK_VERSION} provided at ${ANDROI
2828
echo -e "INFO: Build options: $*\n" 1>>"${BASEDIR}"/build.log 2>&1
2929

3030
# SET DEFAULT BUILD OPTIONS
31-
GPL_ENABLED="no"
31+
export GPL_ENABLED="no"
3232
DISPLAY_HELP=""
3333
BUILD_FULL=""
3434
BUILD_TYPE_ID=""
@@ -105,7 +105,7 @@ while [ ! $# -eq 0 ]; do
105105
BUILD_FULL="1"
106106
;;
107107
--enable-gpl)
108-
GPL_ENABLED="yes"
108+
export GPL_ENABLED="yes"
109109
;;
110110
--enable-custom-library-*)
111111
CUSTOM_LIBRARY_OPTION_KEY=$(echo $1 | sed -e 's/^--enable-custom-//g;s/=.*$//g')

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
apply plugin: 'com.android.library'
22

33
android {
4-
compileSdkVersion 30
4+
compileSdkVersion 31
55
ndkVersion "22.1.7171670"
66

77
defaultConfig {
88
minSdkVersion 24
9-
targetSdkVersion 30
10-
versionCode 240451
11-
versionName "4.5.1"
9+
targetSdkVersion 31
10+
versionCode 240510
11+
versionName "5.1"
1212
project.archivesBaseName = "ffmpeg-kit"
1313
consumerProguardFiles 'proguard-rules.pro'
1414
}

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ volatile int handleSIGXCPU = 1;
106106
volatile int handleSIGPIPE = 1;
107107

108108
/** Holds the id of the current session */
109-
__thread volatile long globalSessionId = 0;
109+
__thread long globalSessionId = 0;
110110

111111
/** Holds the default log level */
112112
int configuredLogLevel = AV_LOG_INFO;

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.5.1"
30+
#define FFMPEG_KIT_VERSION "5.1"
3131

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

android/ffmpeg-kit-android-lib/src/main/cpp/ffprobekit.c

+2-1
Original file line numberDiff line numberDiff line change
@@ -24,13 +24,14 @@
2424
#include "config.h"
2525
#include "libavcodec/jni.h"
2626
#include "libavutil/bprint.h"
27+
#include "libavutil/mem.h"
2728
#include "ffmpegkit.h"
2829

2930
/** Forward declaration for function defined in fftools_ffprobe.c */
3031
int ffprobe_execute(int argc, char **argv);
3132

3233
extern int configuredLogLevel;
33-
extern __thread volatile long globalSessionId;
34+
extern __thread long globalSessionId;
3435
extern void addSession(long sessionId);
3536
extern void removeSession(long sessionId);
3637
extern void resetMessagesInTransmit(long sessionId);

0 commit comments

Comments
 (0)