k0.7.5

z-houbin · Nov 24, 2016 · 7f479bf · 7f479bf
1 parent 0008a7a
commit 7f479bf
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 26 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,11 +1,19 @@
 tag next
 --------------------------------
 
+tag k0.7.5
+--------------------------------
+- ffmpeg: disable-asm on architecture x86
+- ffmpeg: revert some cutted demuxer and decoder
+- ios: add playback volume interface
+
 tag k0.7.4
+--------------------------------
 - ffplay: fix sample buffer leak introduced in k0.7.1
 - doc: add takeoff checklist
 
 tag k0.7.3
+--------------------------------
 - ios: turn videotoolbox into singleton
 - ffmpeg: merge ipv6 issue in tcp.c
 

diff --git a/README.md b/README.md
@@ -21,17 +21,17 @@ allprojects {
 
 dependencies {
     # required, enough for most devices.
-    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.4'
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.4'
+    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.5'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.5'
 
     # Other ABIs: optional
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.4'
-    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.4'
-    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.4'
-    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.4'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.5'
+    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.5'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.5'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.5'
 
     # ExoPlayer as IMediaPlayer: optional, experimental
-    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.4'
+    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.5'
 }
 ```
 - iOS
@@ -137,7 +137,7 @@ sudo dpkg-reconfigure dash
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android
 cd ijkplayer-android
-git checkout -B latest k0.7.4
+git checkout -B latest k0.7.5
 
 ./init-android.sh
 
@@ -191,7 +191,7 @@ cd ..
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios
 cd ijkplayer-ios
-git checkout -B latest k0.7.4
+git checkout -B latest k0.7.5
 
 ./init-ios.sh
 

diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle
@@ -26,8 +26,8 @@ ext {
 
     targetSdkVersion = 23
 
-    versionCode = 700400
-    versionName = "0.7.4"
+    versionCode = 700500
+    versionName = "0.7.5"
 }
 
 wrapper {

diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties
@@ -17,8 +17,8 @@
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
 
-VERSION_NAME=0.7.4
-VERSION_CODE=700400
+VERSION_NAME=0.7.5
+VERSION_CODE=700500
 GROUP=tv.danmaku.ijk.media
 
 # http://central.sonatype.org/pages/requirements.html

diff --git a/android/ijkplayer/ijkplayer-example/build.gradle b/android/ijkplayer/ijkplayer-example/build.gradle
@@ -54,18 +54,18 @@ dependencies {
     all64Compile project(':ijkplayer-x86')
     all64Compile project(':ijkplayer-x86_64')
 
-    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.4'
-    // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.4'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.5'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.5'
 
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.4'
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.4'
-    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.4'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.5'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.5'
+    // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.5'
 
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.4'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.4'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.4'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.4'
-    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.4'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.5'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.5'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.5'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.5'
+    // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.5'
 
     // armv5Compile project(':player-armv5')
     // armv7aCompile project(':player-armv7a')

diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle
@@ -28,7 +28,7 @@ dependencies {
     compile 'com.google.android.exoplayer:exoplayer:r1.5.11'
 
     compile project(':ijkplayer-java')
-    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.4'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.5'
 }
 
 gradle.startParameter.taskNames.each { task ->

diff --git a/version.sh b/version.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION_CODE=700400
-VERSION_NAME=0.7.4
+VERSION_CODE=700500
+VERSION_NAME=0.7.5
 VERSION_TARGET=$1
 
 do_version_readme() {