Compare commits

...

5 Commits

Author SHA1 Message Date
chenliming b0e88e182a remove pili_rtmp 2016-08-31 11:02:47 +08:00
chenliming 3ebd933b6c update version 2016-08-31 11:02:08 +08:00
chenliming db0814ca4c update 2016-08-31 11:00:43 +08:00
chenliming 3a9e0efb73 update 2016-08-31 10:46:14 +08:00
chenliming 7bcc82a03e update.. 2016-08-31 10:36:24 +08:00
25 changed files with 13 additions and 6 deletions
+2 -2
View File
@@ -2,7 +2,7 @@
Pod::Spec.new do |s|
s.name = "LFLiveKit"
s.version = "2.2.2.6"
s.version = "2.2.4"
s.summary = "LaiFeng ios Live. LFLiveKit."
s.homepage = "https://github.com/chenliming777"
s.license = { :type => "MIT", :file => "LICENSE" }
@@ -18,6 +18,6 @@ Pod::Spec.new do |s|
s.libraries = "c++", "z"
s.requires_arc = true
s.ios.vendored_frameworks = 'Vendor/GPUImage.framework','Vendor/pili_rtmp.framework'
s.ios.vendored_frameworks = 'Vendor/GPUImage.framework','Vendor/pili-librtmp.framework'
end
+1 -1
View File
@@ -15,7 +15,7 @@
<key>CFBundlePackageType</key>
<string>FMWK</string>
<key>CFBundleShortVersionString</key>
<string>2.2.2.6</string>
<string>2.2.4</string>
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
@@ -501,7 +501,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/../Vendor/GPUImage.framework/Headers\"",
"\"$(SRCROOT)/../Vendor/pili_rtmp.framework/Headers\"",
"\"$(SRCROOT)/../Vendor/pili-librtmp.framework/Headers\"",
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -524,7 +524,7 @@
DYLIB_INSTALL_NAME_BASE = "@rpath";
HEADER_SEARCH_PATHS = (
"\"$(SRCROOT)/../Vendor/GPUImage.framework/Headers\"",
"\"$(SRCROOT)/../Vendor/pili_rtmp.framework/Headers\"",
"\"$(SRCROOT)/../Vendor/pili-librtmp.framework/Headers\"",
);
INFOPLIST_FILE = Info.plist;
INSTALL_PATH = "$(LOCAL_LIBRARY_DIR)/Frameworks";
@@ -7,7 +7,14 @@
//
#import "LFStreamRTMPSocket.h"
#if __has_include(<pili-librtmp/rtmp.h>)
#import <pili-librtmp/rtmp.h>
#elif __has_include("pili-librtmp/rtmp.h")
#import "pili-librtmp/rtmp.h"
#else
#import "rtmp.h"
#endif
static const NSInteger RetryTimesBreaken = 20; ///< 重连1分钟 3秒一次 一共20次
static const NSInteger RetryTimesMargin = 3;
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -46,7 +46,7 @@
</data>
<key>Info.plist</key>
<data>
IXtWyFBgIb9xtuVHWWG7iOCpFVg=
jBTUuQpeANWyu36KXLiUdaEFXR8=
</data>
</dict>
<key>files2</key>
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.