k0.5.1

bbcallen · bbcallen · commit 115ba2e1e7b2 · 2016-04-25T21:41:38.000+08:00
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,10 @@
 tag next
 --------------------------------
 
+tag k0.5.1
+--------------------------------
+- ffmpeg: fix crash introduced in k0.5.0
+
 tag k0.5.0
 --------------------------------
 - ffmpeg: upgrade to n3.0
diff --git a/README.md b/README.md
@@ -16,17 +16,17 @@ allprojects {
 
 dependencies {
     # required, enough for most devices.
-    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.5.0'
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.5.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-java:0.5.1'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv7a:0.5.1'
 
     # Other ABIs: optional
-    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.5.0'
-    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.5.0'
-    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.5.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-armv5:0.5.1'
+    compile 'tv.danmaku.ijk.media:ijkplayer-arm64:0.5.1'
+    compile 'tv.danmaku.ijk.media:ijkplayer-x86:0.5.1'
     compile 'tv.danmaku.ijk.media:ijkplayer-x86_64:0.5.0'
 
     # ExoPlayer as IMediaPlayer: optional, experimental
-    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.5.0'
+    compile 'tv.danmaku.ijk.media:ijkplayer-exo:0.5.1'
 }
 ```
 - iOS
@@ -136,7 +136,7 @@ sudo dpkg-reconfigure dash
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android
 cd ijkplayer-android
-git checkout -B latest k0.5.0
+git checkout -B latest k0.5.1
 
 ./init-android.sh
 
@@ -176,7 +176,7 @@ cd ..
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios
 cd ijkplayer-ios
-git checkout -B latest k0.5.0
+git checkout -B latest k0.5.1
 
 ./init-ios.sh
 
diff --git a/android/ijkplayer/build.gradle b/android/ijkplayer/build.gradle
@@ -26,8 +26,8 @@ ext {
 
     targetSdkVersion = 23
 
-    versionCode = 500000
-    versionName = "0.5.0"
+    versionCode = 501000
+    versionName = "0.5.1"
 }
 
 wrapper {
diff --git 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.5.0
-VERSION_CODE=500000
+VERSION_NAME=0.5.1
+VERSION_CODE=501000
 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
@@ -25,7 +25,7 @@ dependencies {
     compile 'com.google.android.exoplayer:exoplayer:r1.5.7'
 
     compile project(':ijkplayer-java')
-    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.5.0'
+    // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.5.1'
 }
 
 ext {
diff --git a/version.sh b/version.sh
@@ -2,8 +2,8 @@
 
 set -e
 
-VERSION_CODE=500000
-VERSION_NAME=0.5.0
+VERSION_CODE=501000
+VERSION_NAME=0.5.1
 
 echo_usage() {
     echo ""

Original file line number	Diff line number	Diff line change
`@@ -26,8 +26,8 @@ ext {`
`26`	`26`
`27`	`27`	`targetSdkVersion = 23`
`28`	`28`
`29`		`- versionCode = 500000`
`30`		`- versionName = "0.5.0"`
	`29`	`+ versionCode = 501000`
	`30`	`+ versionName = "0.5.1"`
`31`	`31`	`}`
`32`	`32`
`33`	`33`	`wrapper {`
Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,7 @@ dependencies {`
`25`	`25`	`compile 'com.google.android.exoplayer:exoplayer:r1.5.7'`
`26`	`26`
`27`	`27`	`compile project(':ijkplayer-java')`
`28`		`- // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.5.0'`
	`28`	`+ // compile 'tv.danmaku.ijk.media:ijkplayer-java:0.5.1'`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`ext {`