diff --git a/IJKMediaPlayerKit.podspec b/IJKMediaPlayerKit.podspec index ff4f5fc210..3a4198d653 100644 --- a/IJKMediaPlayerKit.podspec +++ b/IJKMediaPlayerKit.podspec @@ -8,7 +8,7 @@ Pod::Spec.new do |s| s.name = 'IJKMediaPlayerKit' - s.version = '0.11.6' + s.version = '0.11.7' s.summary = 'IJKMediaPlayerKit for ios/macOS/tvOS.' # This description is used to generate tags and improve search results. diff --git a/README.md b/README.md index a44446ceac..d85a3f2673 100644 --- a/README.md +++ b/README.md @@ -54,7 +54,7 @@ ijk media player based on [ffplay](http://ffmpeg.org) install use cocoapod: ``` -pod "IJKMediaPlayerKit", :podspec => 'https://github.com/debugly/ijkplayer/releases/download/k0.11.6/IJKMediaPlayerKit.spec.json' +pod "IJKMediaPlayerKit", :podspec => 'https://github.com/debugly/ijkplayer/releases/download/k0.11.7/IJKMediaPlayerKit.spec.json' ``` ## Development @@ -66,7 +66,7 @@ how to run examples: ``` git clone https://github.com/debugly/ijkplayer.git ijkplayer cd ijkplayer -git checkout -B latest k0.11.6 +git checkout -B latest k0.11.7 git submodule update --init ./FFToolChain/main.sh install -p macos -l 'ass ffmpeg' diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle index ae39a3699b..470db6ed1d 100644 --- a/android/ijkplayer/build.gradle +++ b/android/ijkplayer/build.gradle @@ -26,8 +26,8 @@ ext { targetSdkVersion = 25 - versionCode = 1100600 - versionName = "0.11.6" + versionCode = 1100700 + versionName = "0.11.7" } wrapper { diff --git a/android/ijkplayer/gradle.properties b/android/ijkplayer/gradle.properties index 119087bb9e..4b8e717f37 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.11.6 -VERSION_CODE=1100600 +VERSION_NAME=0.11.7 +VERSION_CODE=1100700 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 5531070f76..22a8788bfc 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.11.6' - // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.11.6' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.7' + // compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.11.7' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.6' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.6' - // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.6' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.7' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.7' + // all32Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.7' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.6' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.6' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.11.6' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.6' - // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.11.6' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.11.7' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.11.7' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.11.7' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.11.7' + // all64Compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.11.7' // 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 3ec3e4d0ea..ec80e421d4 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.11.6' + // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.11.7' } gradle.startParameter.taskNames.each { task -> diff --git a/examples/ios/Podfile.lock b/examples/ios/Podfile.lock index 8bb81e9ba5..46ba49963e 100644 --- a/examples/ios/Podfile.lock +++ b/examples/ios/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - IJKMediaPlayerKit (0.11.6) + - IJKMediaPlayerKit (0.11.7) DEPENDENCIES: - IJKMediaPlayerKit (from `../../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - IJKMediaPlayerKit: 1b9d8c06af1e5251d4fe68094415b311b0733cac + IJKMediaPlayerKit: 6aa25584a1952b0a3bce400889932ee5e5530b52 PODFILE CHECKSUM: cd296d63e0523ffeac3abedb895edb14934a2d48 diff --git a/examples/ios/build-framework.sh b/examples/ios/build-framework.sh index c8fd3e4b55..287af1c78b 100755 --- a/examples/ios/build-framework.sh +++ b/examples/ios/build-framework.sh @@ -51,7 +51,7 @@ xcodebuild -workspace ${WORKSPACE_NAME} -scheme ${TARGET_NAME} \ -destination 'generic/platform=iOS' \ -destination 'generic/platform=iOS Simulator' \ BUILD_DIR=. \ -clean build >/dev/null +clean build echo "ios framework dir:$WORK_DIR" echo "ios simulator framework dir: $SIM_WORK_DIR" \ No newline at end of file diff --git a/examples/macos/Podfile.lock b/examples/macos/Podfile.lock index beb8637e84..f1855c7163 100644 --- a/examples/macos/Podfile.lock +++ b/examples/macos/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - IJKMediaPlayerKit (0.11.6) + - IJKMediaPlayerKit (0.11.7) DEPENDENCIES: - IJKMediaPlayerKit (from `../../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - IJKMediaPlayerKit: 1b9d8c06af1e5251d4fe68094415b311b0733cac + IJKMediaPlayerKit: 6aa25584a1952b0a3bce400889932ee5e5530b52 PODFILE CHECKSUM: f950a6923955cd8172bbcde59a7c414fe1a4ac71 diff --git a/examples/macos/build-framework.sh b/examples/macos/build-framework.sh index 8b1034cf72..7bb8add16d 100755 --- a/examples/macos/build-framework.sh +++ b/examples/macos/build-framework.sh @@ -43,6 +43,6 @@ xcodebuild -workspace ${WORKSPACE_NAME} -scheme ${TARGET_NAME} \ -configuration Release \ -destination 'generic/platform=macOS' \ BUILD_DIR=. \ -clean build >/dev/null +clean build echo "framework dir: ${WORK_DIR}" \ No newline at end of file diff --git a/examples/tvos/Podfile.lock b/examples/tvos/Podfile.lock index 12ec44e007..c3da1290cb 100644 --- a/examples/tvos/Podfile.lock +++ b/examples/tvos/Podfile.lock @@ -1,5 +1,5 @@ PODS: - - IJKMediaPlayerKit (0.11.6) + - IJKMediaPlayerKit (0.11.7) DEPENDENCIES: - IJKMediaPlayerKit (from `../../`) @@ -9,7 +9,7 @@ EXTERNAL SOURCES: :path: "../../" SPEC CHECKSUMS: - IJKMediaPlayerKit: 1b9d8c06af1e5251d4fe68094415b311b0733cac + IJKMediaPlayerKit: 6aa25584a1952b0a3bce400889932ee5e5530b52 PODFILE CHECKSUM: 61b62f37b598e87b9117082bdf528ef9f99adafb diff --git a/examples/tvos/build-framework.sh b/examples/tvos/build-framework.sh index c32acbf9e5..907a641934 100755 --- a/examples/tvos/build-framework.sh +++ b/examples/tvos/build-framework.sh @@ -49,7 +49,7 @@ xcodebuild -workspace ${WORKSPACE_NAME} -scheme ${TARGET_NAME} \ -destination 'generic/platform=tvOS Simulator' \ -destination 'generic/platform=tvOS' \ BUILD_DIR=. \ -clean build >/dev/null +clean build echo "tvos framework dir:$WORK_DIR" echo "tvos simulator framework dir: $SIM_WORK_DIR" diff --git a/ijkmedia/ijkplayer/ff_ffplay.c b/ijkmedia/ijkplayer/ff_ffplay.c index e9dd3ece21..a4f21886cc 100755 --- a/ijkmedia/ijkplayer/ff_ffplay.c +++ b/ijkmedia/ijkplayer/ff_ffplay.c @@ -3422,7 +3422,8 @@ static int read_thread(void *arg) err = avformat_open_input(&ic, is->filename, is->iformat, &ffp->format_opts); if (err < 0) { ret = -1; - av_log(NULL, AV_LOG_ERROR, "open input failed:%s,err:%d\n", is->filename, err); + + av_log(NULL, AV_LOG_ERROR, "open [%s] failed:%s,err:%d\n", is->filename, av_err2str(err), err); last_error = err; goto fail; } diff --git a/version.sh b/version.sh index 91459a8086..762a677990 100755 --- a/version.sh +++ b/version.sh @@ -2,8 +2,8 @@ set -e -VERSION_CODE=1100600 -VERSION_NAME=0.11.6 +VERSION_CODE=1100700 +VERSION_NAME=0.11.7 VERSION_TARGET=$1 echo "alter version to $VERSION_NAME"