From 58a7eebe5c2217de39c69790f684836bfc6d0ff1 Mon Sep 17 00:00:00 2001 From: Xinzheng Zhang Date: Tue, 8 Nov 2016 18:41:02 +0800 Subject: [PATCH] k0.7.3 --- NEWS.md | 6 ++++++ 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 +- .../IJKFFMoviePlayerController.m | 2 +- version.sh | 4 ++-- 8 files changed, 33 insertions(+), 27 deletions(-) diff --git a/NEWS.md b/NEWS.md index 20297a07..74e735a5 100644 --- a/NEWS.md +++ b/NEWS.md @@ -1,6 +1,12 @@ tag next -------------------------------- + +tag k0.7.3 +- ios: turn videotoolbox into singleton +- ffmoeg: merge ipv6 issue in tcp.c + tag k0.7.2 +------------------------------- - ios: fix a compile error tag k0.7.1 diff --git a/README.md b/README.md index 03681444..ff6554b6 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.7.2' - compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.2' + compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.3' + compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.3' # Other ABIs: optional - compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.2' - compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.2' - compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.2' - compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.2' + compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.3' + compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.3' + compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.3' + compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.3' # ExoPlayer as IMediaPlayer: optional, experimental - compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.2' + compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.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.7.2 +git checkout -B latest k0.7.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.7.2 +git checkout -B latest k0.7.3 ./init-ios.sh diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index 7dc2a3b5..27a38ee9 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -26,8 +26,8 @@ ext { targetSdkVersion = 23 - versionCode = 700100 - versionName = "0.7.2" + versionCode = 700300 + versionName = "0.7.3" } wrapper { diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties index a7cd3e19..e4c74261 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.7.2 -VERSION_CODE=700100 +VERSION_NAME=0.7.3 +VERSION_CODE=700300 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 403535b4..cdb87eb7 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.7.2' - // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.2' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.3' + // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.7.3' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.2' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.2' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.2' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.3' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.3' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.3' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.2' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.2' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.7.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.7.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.7.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.7.3' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.7.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 52d3a58b..5b7b33ce 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.7.2' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.7.3' } gradle.startParameter.taskNames.each { task -> diff --git a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m index 6f09022c..e21ee062 100644 --- a/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m +++ b/ios/IJKMediaPlayer/IJKMediaPlayer/IJKFFMoviePlayerController.m @@ -32,7 +32,7 @@ #include "string.h" -static const char *kIJKFFRequiredFFmpegVersion = "ff3.2--ijk0.7.0--20161102--001"; +static const char *kIJKFFRequiredFFmpegVersion = "ff3.2--ijk0.7.2-20161107--001"; // It means you didn't call shutdown if you found this object leaked. @interface IJKWeakHolder : NSObject diff --git a/version.sh b/version.sh index 5015b4f4..8e7b584d 100755 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ set -e -VERSION_CODE=700100 -VERSION_NAME=0.7.2 +VERSION_CODE=700300 +VERSION_NAME=0.7.3 VERSION_TARGET=$1 do_version_readme() { -- GitLab