From bda2833f8eeb273269639c688251fcd9306d167e Mon Sep 17 00:00:00 2001 From: Zhang Rui Date: Thu, 12 Nov 2015 14:59:35 +0800 Subject: [PATCH] k0.4.3 --- NEWS.md | 3 +++ README.md | 16 ++++++++-------- android/ijkplayer/build.gradle | 4 ++-- android/ijkplayer/gradle.properties | 4 ++-- android/ijkplayer/ijkplayer-exo/build.gradle | 2 +- version.sh | 4 ++-- 6 files changed, 18 insertions(+), 15 deletions(-) diff --git a/NEWS.md b/NEWS.md index 05f5750d..50adaee4 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,5 +1,8 @@ tag next -------------------------------- + +tag k0.4.3 +-------------------------------- - android: fix several crash when reconfiguring MediaCodec - android: add jjk to generate API native wrapper - android: support IMediaDataSource for user to supply media data diff --git a/README.md b/README.md index 341acabd..5680eec6 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,16 @@ allprojects { dependencies { # required, enough for most devices. - compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.2.4' - compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.4.2.4' + compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.3' + compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.4.3' # Other ABIs: optional - compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.4.2.4' - compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.4.2.4' - compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.4.2.4' + compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.4.3' + compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.4.3' + compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.4.3' # ExoPlayer as IMediaPlayer: optional, experimental - compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.4.2.4' + compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.4.3' } ``` - iOS @@ -135,7 +135,7 @@ sudo dpkg-reconfigure dash ``` git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android cd ijkplayer-android -git checkout -B latest k0.4.2.4 +git checkout -B latest k0.4.3 ./init-android.sh @@ -175,7 +175,7 @@ cd .. ``` git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios cd ijkplayer-ios -git checkout -B latest k0.4.2.4 +git checkout -B latest k0.4.3 ./init-ios.sh diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index ce1e998f..c0fd5e84 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -26,8 +26,8 @@ ext { targetSdkVersion = 23 - versionCode = 402004 - versionName = "0.4.2.4" + versionCode = 403000 + versionName = "0.4.3" } wrapper { diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties index 4da38e23..193239cb 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.4.2.4 -VERSION_CODE=402004 +VERSION_NAME=0.4.3 +VERSION_CODE=403000 GROUP=tv.danmaku.ijk.media # http://central.sonatype.org/pages/requirements.html diff --git a/android/ijkplayer/ijkplayer-exo/build.gradle b/android/ijkplayer/ijkplayer-exo/build.gradle index 6fc3e16d..e6c1a3cb 100644 --- a/android/ijkplayer/ijkplayer-exo/build.gradle +++ b/android/ijkplayer/ijkplayer-exo/build.gradle @@ -25,7 +25,7 @@ dependencies { compile 'com.google.android.exoplayer:exoplayer:r1.5.1' compile project(':ijkplayer-java') - // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.2.4' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.4.3' } // apply from: '../tools/gradle-mvn-push.gradle' diff --git a/version.sh b/version.sh index d8efccb8..c8d6de94 100755 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ set -e -VERSION_CODE=402004 -VERSION_NAME=0.4.2.4 +VERSION_CODE=403000 +VERSION_NAME=0.4.3 echo_usage() { echo "" -- GitLab