diff --git a/NEWS.md b/NEWS.md index 20297a07c666395cfcc8920684e1d11c27f94540..74e735a5ce5dd0b5a6af9a44db63428d187e7785 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 03681444e579cce9aacfb8c67fc445cb85d5a0ff..ff6554b652dbda581d2a7852eee83c2c32093f26 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 7dc2a3b57d585b866f2ae32ceef05a3f3a978571..27a38ee9048100c8c2ec88961a5d98fa13e4b5db 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 a7cd3e19997241afa56b8dd03a951ff6bfab88c8..e4c742613e51b288de16618914d294eb59974ad4 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 403535b40ae5e3ee1ab1a9c0b0adea4d3bd7a1de..cdb87eb775f6f6e7a0c77056eb6f10244b2b4d7a 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 52d3a58bb45ebe346e434055ddc5f85c59d9e146..5b7b33ce0130872455247ee2fcae067e4aae9d8f 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 6f09022c36c9aa11858644f89785196d5343fae7..e21ee0629218174b89ad7600f434f036e6fe2e74 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 5015b4f42d91e45a022c6efb1d7a9520697868bd..8e7b584d64a5606acf2a03ec3143dff4beb698ad 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() {