Merge branch 'release/v0.2.4'

cropsly · Oct 7, 2014 · 2792080 · 2792080
2 parents 0dc179e + 2d1e4b0
commit 2792080
Show file tree

Hide file tree

Showing 9 changed files with 14 additions and 17 deletions.
diff --git a/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a-neon/ffmpeg
diff --git a/FFmpegAndroid/assets/armeabi-v7a/ffmpeg b/FFmpegAndroid/assets/armeabi-v7a/ffmpeg
diff --git a/FFmpegAndroid/assets/x86/ffmpeg b/FFmpegAndroid/assets/x86/ffmpeg
diff --git a/FFmpegAndroid/build.gradle b/FFmpegAndroid/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.github.hiteshsondhi88.libffmpeg"
         minSdkVersion 16
         targetSdkVersion 16
-        versionCode 23
-        versionName "0.2.3"
+        versionCode 24
+        versionName "0.2.4"
     }
 
     sourceSets.main {

diff --git a/FFmpegAndroid/src/main/AndroidManifest.xml b/FFmpegAndroid/src/main/AndroidManifest.xml
@@ -1,8 +1,5 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.github.hiteshsondhi88.libffmpeg">
+<manifest package="com.github.hiteshsondhi88.libffmpeg">
 
-    <application
-        android:label="@string/app_name">
-    </application>
+    <application />
 
 </manifest>
diff --git a/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java b/FFmpegAndroid/src/main/java/com/github/hiteshsondhi88/libffmpeg/CpuArch.java
@@ -3,9 +3,9 @@
 import android.text.TextUtils;
 
 enum CpuArch {
-    x86("a0f523f4fce7e4a4b0ad1e86dfa5c3d54ac93b91"),
-    ARMv7("6b9b3d574740d69fd50fd6d75e04c71ae3a95c72"),
-    ARMv7_NEON("ac0418277061dc8b7547fee51e3e84457069806e"),
+    x86("1b3daf0402c38ec0019ec436d71a1389514711bd"),
+    ARMv7("e27cf3c432b121896fc8af2d147eff88d3074dd5"),
+    ARMv7_NEON("9463c40e898c53dcac59b8ba39cfd590e2f1b1bf"),
     NONE(null);
 
     private String sha1;

diff --git a/FFmpegAndroid/src/main/res/values/strings.xml b/FFmpegAndroid/src/main/res/values/strings.xml
@@ -1,4 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <string name="app_name">FFmpegAndroid</string>
-    <string name="shipped_ffmpeg_version">n2.4</string>
-</resources>
+    <string name="shipped_ffmpeg_version">n2.4.2</string>
+</resources>
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.github.hiteshsondhi88.sampleffmpeg"
         minSdkVersion 16
         targetSdkVersion 20
-        versionCode 23
-        versionName "0.2.3"
+        versionCode 24
+        versionName "0.2.4"
     }
 
     sourceSets.main {

diff --git a/gradle.properties b/gradle.properties
@@ -1,5 +1,5 @@
-VERSION_NAME=0.2.3
-VERSION_CODE=23
+VERSION_NAME=0.2.4
+VERSION_CODE=24
 GROUP=com.github.hiteshsondhi88.libffmpeg
 
 POM_DESCRIPTION=Java implementation of ffmpeg for Android