k0.4.0

bbcallen · bbcallen · commit 33406e2d3121 · 2015-09-11T14:31:18.000+08:00
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,9 @@
 tag next
 --------------------------------
-android: support FileDescriptor as data source
+
+tag k0.4.0
+--------------------------------
+ffmpeg: switch to ffmpeg n2.8
 
 tag k0.3.3
 --------------------------------
diff --git a/README.md b/README.md
@@ -5,11 +5,10 @@ ijkplayer
 
 ### My Build Enviroment
 - Common
- - Mac OS X 10.10.4
+ - Mac OS X 10.10.5
 - Android
  - [NDK r10e](http://developer.android.com/tools/sdk/ndk/index.html)
- - Android Studio 1.3.1
- - Android SDK Build Tools 23.0.0
+ - Android Studio 1.3.2
 - iOS
  - Xcode 6.4 (6E35b)
 - [HomeBrew](http://brew.sh)
@@ -95,7 +94,7 @@ sudo dpkg-reconfigure dash
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-android
 cd ijkplayer-android
-git checkout -B latest k0.3.3
+git checkout -B latest k0.4.0
 
 ./init-android.sh
 
@@ -112,8 +111,8 @@ cd ..
 #
 #     define ext block in your root build.gradle
 #     ext {
-#       compileSdkVersion = 22       // depending on your sdk version
-#       buildToolsVersion = "22.0.1" // depending on your build tools version
+#       compileSdkVersion = 23       // depending on your sdk version
+#       buildToolsVersion = "23.0.0" // depending on your build tools version
 #     }
 #
 # Eclipse: (obselete)
@@ -133,7 +132,7 @@ cd ..
 ```
 git clone https://github.com/Bilibili/ijkplayer.git ijkplayer-ios
 cd ijkplayer-ios
-git checkout -B latest k0.3.2
+git checkout -B latest k0.4.0
 
 ./init-ios.sh
 
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.3.3
-VERSION_CODE=303000
+VERSION_NAME=0.4.0
+VERSION_CODE=400000
 GROUP=tv.danmaku.ijk.media
 
 POM_DESCRIPTION=Video player based on FFmpeg n2.7
diff --git a/android/ijkplayer/sample/build.gradle b/android/ijkplayer/sample/build.gradle
@@ -11,8 +11,8 @@ android {
         applicationId "tv.danmaku.ijk.media.sample"
         minSdkVersion 9
         targetSdkVersion 22
-        versionCode 303000
-        versionName "0.3.3"
+        versionCode 400000
+        versionName "0.4.0"
     }
     buildTypes {
         release {
