From 1361a9e1fb3aaec440ff8ff26e147a1ed76229c0 Mon Sep 17 00:00:00 2001 From: Xinzheng Zhang Date: Mon, 17 Oct 2016 17:42:13 +0800 Subject: [PATCH] k0.6.3 --- NEWS.md | 5 +++++ README.md | 18 ++++++++--------- android/ijkplayer/build.gradle | 4 ++-- android/ijkplayer/gradle.properties | 4 ++-- .../ijkplayer/ijkplayer-example/build.gradle | 20 +++++++++---------- android/ijkplayer/ijkplayer-exo/build.gradle | 2 +- version.sh | 4 ++-- 7 files changed, 31 insertions(+), 26 deletions(-) diff --git a/NEWS.md b/NEWS.md index 3f720e83..40590845 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,11 @@ tag next -------------------------------- +tag k0.6.3 +-------------------------------- +- ffmpeg: fix crash happened in xcode8 +- player: rewrite ijkversion + tag k0.6.2 -------------------------------- - ffmpeg: fix wild pointer when decoder was not found diff --git a/README.md b/README.md index 496d9361..1fca74d4 100644 --- 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.6.2' - compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.2' + compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.3' + compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.3' # Other ABIs: optional - compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.2' - compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.6.2' - compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.2' - compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.6.2' + compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.3' + compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.6.3' + compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.3' + compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.6.3' # ExoPlayer as IMediaPlayer: optional, experimental - compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.2' + compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.3' } ``` - 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.6.2 +git checkout -B latest k0.6.3 ./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.6.2 +git checkout -B latest k0.6.3 ./init-ios.sh diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index ccc19bed..7d0da7ac 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -26,8 +26,8 @@ ext { targetSdkVersion = 23 - versionCode = 602000 - versionName = "0.6.2" + versionCode = 603000 + versionName = "0.6.3" } wrapper { diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties index 975277e7..8f7422bf 100644 --- 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.6.2 -VERSION_CODE=602000 +VERSION_NAME=0.6.3 +VERSION_CODE=603000 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 index c374e7c9..f03a78c5 100644 --- 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.6.2' - // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.2' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.3' + // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.6.3' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.2' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.2' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.2' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.3' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.3' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.3' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.6.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.6.2' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.6.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.6.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.6.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.6.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.6.3' // armv5Compile project(':player-armv5') // armv7aCompile project(':player-armv7a') diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle index 280111df..eaf3c487 100644 --- 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.6.2' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.6.3' } gradle.startParameter.taskNames.each { task -> diff --git a/version.sh b/version.sh index 7e68d740..c2605303 100755 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ set -e -VERSION_CODE=602000 -VERSION_NAME=0.6.2 +VERSION_CODE=603000 +VERSION_NAME=0.6.3 VERSION_TARGET=$1 do_version_readme() { -- GitLab