Merge pull request #120 from red5pro/develop

Develop
red5pro · Dec 11, 2017 · 34d41eb · 34d41eb
2 parents c9cdf57 + 5aed644
commit 34d41eb
Show file tree

Hide file tree

Showing 37 changed files with 228 additions and 43 deletions.
diff --git a/...ctiveCExamples/R5ProObjectiveCExamples/R5Streaming.framework/_CodeSignature/CodeDirectory b/...ctiveCExamples/R5ProObjectiveCExamples/R5Streaming.framework/_CodeSignature/CodeDirectory
diff --git a/...R5Streaming.framework/Headers/AVEncoder.h → ...R5Streaming.framework/Headers/AVEncoder.h b/...R5Streaming.framework/Headers/AVEncoder.h → ...R5Streaming.framework/Headers/AVEncoder.h
diff --git a/...5Streaming.framework/Headers/FileWriter.h → ...5Streaming.framework/Headers/FileWriter.h b/...5Streaming.framework/Headers/FileWriter.h → ...5Streaming.framework/Headers/FileWriter.h
diff --git a/...ork/Headers/R5AdaptiveBitrateController.h → ...ork/Headers/R5AdaptiveBitrateController.h b/...ork/Headers/R5AdaptiveBitrateController.h → ...ork/Headers/R5AdaptiveBitrateController.h
diff --git a/...ing.framework/Headers/R5AudioController.h → ...ing.framework/Headers/R5AudioController.h b/...ing.framework/Headers/R5AudioController.h → ...ing.framework/Headers/R5AudioController.h
diff --git a/....framework/Headers/R5BandwidthDetection.h → ....framework/Headers/R5BandwidthDetection.h b/....framework/Headers/R5BandwidthDetection.h → ....framework/Headers/R5BandwidthDetection.h
diff --git a/...mework/Headers/R5BandwidthURLConnection.h → ...mework/Headers/R5BandwidthURLConnection.h b/...mework/Headers/R5BandwidthURLConnection.h → ...mework/Headers/R5BandwidthURLConnection.h
diff --git a/.../R5Streaming.framework/Headers/R5Camera.h → .../R5Streaming.framework/Headers/R5Camera.h b/.../R5Streaming.framework/Headers/R5Camera.h → .../R5Streaming.framework/Headers/R5Camera.h
diff --git a/...aming.framework/Headers/R5Configuration.h → ...aming.framework/Headers/R5Configuration.h b/...aming.framework/Headers/R5Configuration.h → ...aming.framework/Headers/R5Configuration.h
diff --git a/...treaming.framework/Headers/R5Connection.h → ...treaming.framework/Headers/R5Connection.h b/...treaming.framework/Headers/R5Connection.h → ...treaming.framework/Headers/R5Connection.h
diff --git a/...eaming.framework/Headers/R5SharedObject.h → ...eaming.framework/Headers/R5SharedObject.h b/...eaming.framework/Headers/R5SharedObject.h → ...eaming.framework/Headers/R5SharedObject.h
diff --git a/.../R5Streaming.framework/Headers/R5Stream.h → .../R5Streaming.framework/Headers/R5Stream.h b/.../R5Streaming.framework/Headers/R5Stream.h → .../R5Streaming.framework/Headers/R5Stream.h
diff --git a/...Streaming.framework/Headers/R5Streaming.h → ...Streaming.framework/Headers/R5Streaming.h b/...Streaming.framework/Headers/R5Streaming.h → ...Streaming.framework/Headers/R5Streaming.h
diff --git a/...reaming.framework/Headers/R5VideoSource.h → ...reaming.framework/Headers/R5VideoSource.h b/...reaming.framework/Headers/R5VideoSource.h → ...reaming.framework/Headers/R5VideoSource.h
diff --git a/...framework/Headers/R5VideoViewController.h → ...framework/Headers/R5VideoViewController.h b/...framework/Headers/R5VideoViewController.h → ...framework/Headers/R5VideoViewController.h
diff --git a/...treaming.framework/Headers/codec_facade.h → ...treaming.framework/Headers/codec_facade.h b/...treaming.framework/Headers/codec_facade.h → ...treaming.framework/Headers/codec_facade.h
diff --git a/...5Streaming.framework/Headers/connection.h → ...5Streaming.framework/Headers/connection.h b/...5Streaming.framework/Headers/connection.h → ...5Streaming.framework/Headers/connection.h
diff --git a/...es/R5Streaming.framework/Headers/global.h → ...es/R5Streaming.framework/Headers/global.h b/...es/R5Streaming.framework/Headers/global.h → ...es/R5Streaming.framework/Headers/global.h
@@ -22,7 +22,8 @@ extern "C" {
 #define STRINGIFY(s) STRINGIFY_(s)
 
 #define R5PRO_MAJOR_VERSION         4
-#define R5PRO_MINOR_VERSION         0
+#define R5PRO_MINOR_VERSION         2
+#define R5PRO_REVISION              0
 #define R5PRO_REVISION              0
 #define R5PRO_BUILD                 0
 

diff --git a/...5Streaming.framework/Headers/parse_util.h → ...5Streaming.framework/Headers/parse_util.h b/...5Streaming.framework/Headers/parse_util.h → ...5Streaming.framework/Headers/parse_util.h
diff --git a/...s/R5Streaming.framework/Headers/publish.h → ...s/R5Streaming.framework/Headers/publish.h b/...s/R5Streaming.framework/Headers/publish.h → ...s/R5Streaming.framework/Headers/publish.h
diff --git a/...g.framework/Headers/session_description.h → ...g.framework/Headers/session_description.h b/...g.framework/Headers/session_description.h → ...g.framework/Headers/session_description.h
diff --git a/...Examples/R5Streaming.framework/Info.plist → ...Examples/R5Streaming.framework/Info.plist b/...Examples/R5Streaming.framework/Info.plist → ...Examples/R5Streaming.framework/Info.plist
diff --git a/...eaming.framework/Modules/module.modulemap → ...eaming.framework/Modules/module.modulemap b/...eaming.framework/Modules/module.modulemap → ...eaming.framework/Modules/module.modulemap
diff --git a/...xamples/R5Streaming.framework/R5Streaming → ...xamples/R5Streaming.framework/R5Streaming b/...xamples/R5Streaming.framework/R5Streaming → ...xamples/R5Streaming.framework/R5Streaming
diff --git a/R5ProObjectiveCExamples/R5Streaming.framework/_CodeSignature/CodeDirectory b/R5ProObjectiveCExamples/R5Streaming.framework/_CodeSignature/CodeDirectory
diff --git a/...framework/_CodeSignature/CodeRequirements → ...framework/_CodeSignature/CodeRequirements b/...framework/_CodeSignature/CodeRequirements → ...framework/_CodeSignature/CodeRequirements
diff --git a/...ng.framework/_CodeSignature/CodeResources → ...ng.framework/_CodeSignature/CodeResources b/...ng.framework/_CodeSignature/CodeResources → ...ng.framework/_CodeSignature/CodeResources
@@ -70,7 +70,7 @@
 		</data>
 		<key>Headers/global.h</key>
 		<data>
-		Nw3CCIKPBu8FVJCbyS9P1hscuFY=
+		g4P3agl0lk6l5MEi9ILiavPB/UE=
 		</data>
 		<key>Headers/parse_util.h</key>
 		<data>
@@ -161,7 +161,7 @@
 		</data>
 		<key>Headers/global.h</key>
 		<data>
-		Nw3CCIKPBu8FVJCbyS9P1hscuFY=
+		g4P3agl0lk6l5MEi9ILiavPB/UE=
 		</data>
 		<key>Headers/parse_util.h</key>
 		<data>