Skip to content

Commit

Permalink
k0.5.1
Browse files Browse the repository at this point in the history
  • Loading branch information
bbcallen committed Apr 25, 2016
1 parent 17032a5 commit 115ba2e
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 15 deletions.
4 changes: 4 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -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
Expand Down
16 changes: 8 additions & 8 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions android/ijkplayer/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@ ext {

targetSdkVersion = 23

versionCode = 500000
versionName = "0.5.0"
versionCode = 501000
versionName = "0.5.1"
}

wrapper {
Expand Down
4 changes: 2 additions & 2 deletions android/ijkplayer/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion android/ijkplayer/ijkplayer-exo/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down
4 changes: 2 additions & 2 deletions version.sh
Original file line number Diff line number Diff line change
Expand Up @@ -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 ""
Expand Down

0 comments on commit 115ba2e

Please sign in to comment.