Merge pull request #118 from lawder/release

v2.1.3 update
pili-engineering · May 16, 2016 · 606c6e5 · 606c6e5
2 parents d6c87a5 + f7bf23e
commit 606c6e5
Show file tree

Hide file tree

Showing 58 changed files with 9,928 additions and 67 deletions.
diff --git a/APIDiffs/api-diffs-2.1.3.md b/APIDiffs/api-diffs-2.1.3.md
@@ -0,0 +1,4 @@
+# PLPlayerKit 2.1.2 to 2.1.3 API Differences
+
+##  No Change
+
diff --git a/Example/PLPlayerKit/PLPlayerViewController.m b/Example/PLPlayerKit/PLPlayerViewController.m
@@ -55,7 +55,12 @@ - (void)setupUI {
         UIView *playerView = self.player.playerView;
         if (!playerView.superview) {
             playerView.contentMode = UIViewContentModeScaleAspectFit;
-            playerView.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin | UIViewAutoresizingFlexibleTopMargin | UIViewAutoresizingFlexibleLeftMargin | UIViewAutoresizingFlexibleRightMargin | UIViewAutoresizingFlexibleWidth;
+            playerView.autoresizingMask = UIViewAutoresizingFlexibleBottomMargin
+            | UIViewAutoresizingFlexibleTopMargin
+            | UIViewAutoresizingFlexibleLeftMargin
+            | UIViewAutoresizingFlexibleRightMargin
+            | UIViewAutoresizingFlexibleWidth
+            | UIViewAutoresizingFlexibleHeight;
             [self.view addSubview:playerView];
 
             // test input

diff --git a/Example/Podfile.lock b/Example/Podfile.lock
@@ -1,7 +1,10 @@
 PODS:
-  - PLPlayerKit (2.1.2):
-    - PLPlayerKit/precompiled (= 2.1.2)
-  - PLPlayerKit/precompiled (2.1.2)
+  - pili-librtmp (1.0.1)
+  - PLPlayerKit (2.1.3):
+    - pili-librtmp
+    - PLPlayerKit/precompiled (= 2.1.3)
+  - PLPlayerKit/precompiled (2.1.3):
+    - pili-librtmp
 
 DEPENDENCIES:
   - PLPlayerKit (from `../`)
@@ -11,6 +14,7 @@ EXTERNAL SOURCES:
     :path: ../
 
 SPEC CHECKSUMS:
-  PLPlayerKit: e0f92eb447e9224eae5f3ab894378f68d691a74b
+  pili-librtmp: 8f2b969a1890e881715a90ab98d4d52baf53c514
+  PLPlayerKit: 7ab6b4339abc656fb56872a17f770618a775194d
 
 COCOAPODS: 0.39.0
diff --git a/Example/Pods/Headers/Private/pili-librtmp/amf.h b/Example/Pods/Headers/Private/pili-librtmp/amf.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/bytes.h b/Example/Pods/Headers/Private/pili-librtmp/bytes.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/dh.h b/Example/Pods/Headers/Private/pili-librtmp/dh.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/dhgroups.h b/Example/Pods/Headers/Private/pili-librtmp/dhgroups.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/error.h b/Example/Pods/Headers/Private/pili-librtmp/error.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/handshake.h b/Example/Pods/Headers/Private/pili-librtmp/handshake.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/http.h b/Example/Pods/Headers/Private/pili-librtmp/http.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/log.h b/Example/Pods/Headers/Private/pili-librtmp/log.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/rtmp.h b/Example/Pods/Headers/Private/pili-librtmp/rtmp.h
diff --git a/Example/Pods/Headers/Private/pili-librtmp/rtmp_sys.h b/Example/Pods/Headers/Private/pili-librtmp/rtmp_sys.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/amf.h b/Example/Pods/Headers/Public/pili-librtmp/amf.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/bytes.h b/Example/Pods/Headers/Public/pili-librtmp/bytes.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/dh.h b/Example/Pods/Headers/Public/pili-librtmp/dh.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/dhgroups.h b/Example/Pods/Headers/Public/pili-librtmp/dhgroups.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/error.h b/Example/Pods/Headers/Public/pili-librtmp/error.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/handshake.h b/Example/Pods/Headers/Public/pili-librtmp/handshake.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/http.h b/Example/Pods/Headers/Public/pili-librtmp/http.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/log.h b/Example/Pods/Headers/Public/pili-librtmp/log.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/rtmp.h b/Example/Pods/Headers/Public/pili-librtmp/rtmp.h
diff --git a/Example/Pods/Headers/Public/pili-librtmp/rtmp_sys.h b/Example/Pods/Headers/Public/pili-librtmp/rtmp_sys.h
diff --git a/Example/Pods/Local Podspecs/PLPlayerKit.podspec.json b/Example/Pods/Local Podspecs/PLPlayerKit.podspec.json
diff --git a/Example/Pods/Manifest.lock b/Example/Pods/Manifest.lock