Skip to content

Commit 791d2a7

Browse files
Merge branch 'release/v0.2.1'
2 parents b92c41b + cb1b5a6 commit 791d2a7

Some content is hidden

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

45 files changed

+360
-148
lines changed

FFmpegAndroid/build.gradle

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@ android {
55
buildToolsVersion "20.0.0"
66

77
defaultConfig {
8-
applicationId "github.hiteshsondhi88.libffmpeg"
8+
applicationId "com.github.hiteshsondhi88.libffmpeg"
99
minSdkVersion 16
1010
targetSdkVersion 16
11-
versionCode 1
12-
versionName "1.0"
11+
versionCode 21
12+
versionName "0.2.1"
1313
}
1414

1515
sourceSets.main {

FFmpegAndroid/gradle.properties

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
POM_NAME=FFmpegAndroid Library
2+
POM_ARTIFACT_ID=FFmpegAndroid
3+
POM_PACKAGING=aar

FFmpegAndroid/jni/armArch.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
#include <cpu-features.h>
55

66
jstring
7-
Java_github_hiteshsondhi88_libffmpeg_ArmArchHelper_cpuArchFromJNI(JNIEnv* env, jobject obj)
7+
Java_com_github_hiteshsondhi88_libffmpeg_ArmArchHelper_cpuArchFromJNI(JNIEnv* env, jobject obj)
88
{
99
// Maximum we need to store here is ARM v7-neon
1010
// Which is 11 char long, so initializing a character array of length 11
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
Binary file not shown.
Binary file not shown.
8 Bytes
Binary file not shown.
Binary file not shown.

FFmpegAndroid/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="github.hiteshsondhi88.libffmpeg">
2+
package="com.github.hiteshsondhi88.libffmpeg">
33

44
<application
55
android:label="@string/app_name">

0 commit comments

Comments
 (0)