Merge branch 'release0.3.4'

befovy · Aug 17, 2019 · 773404a · 773404a
2 parents 2f55858 + 2efa853
commit 773404a
Show file tree

Hide file tree

Showing 8 changed files with 289 additions and 9 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,6 +1,11 @@
 tag next
+--------------------------------
+
 
+tag f0.3.4
 --------------------------------
+- ffmpeg: add rtsp support
+- ios: remove armv7s
 
 tag f0.3.3
 --------------------------------

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=000303
+VERSION_NAME=0.3.4
+VERSION_CODE=000304
 GROUP=com.befovy.fijkplayer
 
 # http://central.sonatype.org/pages/requirements.html

diff --git a/config/module.sh b/config/module.sh
diff --git a/config/module.sh b/config/module.sh
diff --git a/init-android-openssl.sh b/init-android-openssl.sh
@@ -19,7 +19,7 @@
 #IJK_OPENSSL_UPSTREAM=https://github.com/openssl/openssl
 IJK_OPENSSL_UPSTREAM=https://github.com/Bilibili/openssl.git
 IJK_OPENSSL_FORK=https://github.com/Bilibili/openssl.git
-IJK_OPENSSL_COMMIT=OpenSSL_1_0_2n
+IJK_OPENSSL_COMMIT=b34cf4eb61  #tag: OpenSSL_1_0_2r
 IJK_OPENSSL_LOCAL_REPO=extra/openssl
 
 set -e

diff --git a/init-ios-openssl.sh b/init-ios-openssl.sh
@@ -18,7 +18,7 @@
 
 IJK_OPENSSL_UPSTREAM=https://github.com/openssl/openssl
 IJK_OPENSSL_FORK=https://github.com/Bilibili/openssl.git
-IJK_OPENSSL_COMMIT=OpenSSL_1_0_2n
+IJK_OPENSSL_COMMIT=b34cf4eb61  #tag: OpenSSL_1_0_2r
 IJK_OPENSSL_LOCAL_REPO=extra/openssl
 
 set -e

diff --git a/ios/CocoaPodsPub/FIJKPlayer.podspec b/ios/CocoaPodsPub/FIJKPlayer.podspec
@@ -16,7 +16,7 @@ Pod::Spec.new do |spec|
   #
 
   spec.name         = "FIJKPlayer"
-  spec.version      = "0.3.3"
+  spec.version      = "0.3.4"
   spec.summary      = "ijkplayer iOS video player SDK"
 
   spec.author       = { "befovy" => "[email protected]" }
@@ -75,7 +75,7 @@ Pod::Spec.new do |spec|
   #  Supports git, hg, bzr, svn and HTTP.
   #
 
-  spec.source = { :http => "https://github.com/befovy/ijkplayer/releases/download/f0.3.3/FIJKPlayer.tar.gz" }
+  spec.source = { :http => "https://github.com/befovy/ijkplayer/releases/download/f0.3.4/FIJKPlayer.tar.gz" }
   # ――― Source Code ―――――――――――――――――――――――――――――――――――――――――――――――――――――――――――――― #
   #
   #  CocoaPods is smart about how it includes source code. For source files

diff --git a/ios/IJKMediaDemo/IJKMediaDemo/IJKDemoInputURLViewController.m b/ios/IJKMediaDemo/IJKMediaDemo/IJKDemoInputURLViewController.m
@@ -45,6 +45,7 @@ - (void)onClickPlayButton {
 
     if ([scheme isEqualToString:@"http"]
         || [scheme isEqualToString:@"https"]
+        || [scheme isEqualToString:@"rtsp"]
         || [scheme isEqualToString:@"rtmp"]) {
         [IJKVideoViewController presentFromViewController:self withTitle:[NSString stringWithFormat:@"URL: %@", url] URL:url completion:^{
 //            [self.navigationController popViewControllerAnimated:NO];

diff --git a/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist b/ios/IJKMediaDemo/IJKMediaDemo/IJKMediaDemo-Info.plist
@@ -21,11 +21,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.3</string>
+	<string>0.3.4</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>000303</string>
+	<string>000304</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
 	<key>UIFileSharingEnabled</key>