Skip to content

Instantly share code, notes, and snippets.

@j0sh
Created November 2, 2011 19:03
Show Gist options
  • Save j0sh/1334549 to your computer and use it in GitHub Desktop.
Save j0sh/1334549 to your computer and use it in GitHub Desktop.
rtmpd oneiric
diff --git a/builders/cmake/cmake_find_modules/Find_openssl.cmake b/builders/cmake/cmake_find_modules/Find_openssl.cmake
index ff366a0..eac1244 100644
--- a/builders/cmake/cmake_find_modules/Find_openssl.cmake
+++ b/builders/cmake/cmake_find_modules/Find_openssl.cmake
@@ -26,7 +26,7 @@ FIND_LIBRARY(OPENSSL_LIBRARY_PATH
/sw/lib
/usr/local/ssl/lib
/lib
- NO_DEFAULT_PATH)
+ )
FIND_LIBRARY(CRYPTO_LIBRARY_PATH
NAMES
@@ -40,7 +40,7 @@ FIND_LIBRARY(CRYPTO_LIBRARY_PATH
/sw/lib
/usr/local/ssl/lib
/lib
- NO_DEFAULT_PATH)
+ )
IF($ENV{COMPILE_STATIC} MATCHES "1")
FIND_LIBRARY(Z_LIBRARY_PATH
diff --git a/3rdparty/tinyxml/tinyxml.h b/3rdparty/tinyxml/tinyxml.h
index d715c53..230879e 100644
--- a/3rdparty/tinyxml/tinyxml.h
+++ b/3rdparty/tinyxml/tinyxml.h
@@ -39,6 +39,7 @@ distribution.
#include <string>
#include <iostream>
#include <sstream>
+#include <cstddef>
// Help out windows:
#if defined( _DEBUG ) && !defined( DEBUG )
diff --git a/sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp b/sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp
index 2ba44ed..a0cafab 100644
--- a/sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp
+++ b/sources/applications/applestreamingclient/src/protocols/aes/inboundaesprotocol.cpp
@@ -109,7 +109,7 @@ bool InboundAESProtocol::SignalInputData(IOBuffer &buffer) {
_totalDecrypted += decryptedSize;
//6. Decrypt leftovers
- bool transferCompleted = false;
+ bool transferCompleted __attribute__((unused)) = false;
if (((HTTPBufferProtocol *) GetFarProtocol())->TransferCompleted()) {
transferCompleted = true;
EVP_DecryptFinal_ex(&_decContex,
diff --git a/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp b/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp
index 1b0a6bf..48c56c8 100644
--- a/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp
+++ b/sources/thelib/src/protocols/rtmp/basertmpappprotocolhandler.cpp
@@ -977,7 +977,7 @@ bool BaseRTMPAppProtocolHandler::ProcessInvokePauseRaw(BaseRTMPProtocol *pFrom,
Variant & request) {
//1. Read stream index and offset in millisecond
uint32_t streamId = VH_SI(request);
- double timeOffset = 0.0;
+ double timeOffset __attribute__ ((unused)) = 0.0;
if ((VariantType) M_INVOKE_PARAM(request, 1) == V_DOUBLE)
timeOffset = M_INVOKE_PARAM(request, 1);
diff --git a/sources/thelib/src/protocols/rtmp/messagefactories/connectionmessagefactory.cpp b/sources/thelib/src/protocols/rtmp/messagefactories/connectionmessagefactory.cpp
index db5a427..e8e6f22 100644
--- a/sources/thelib/src/protocols/rtmp/messagefactories/connectionmessagefactory.cpp
+++ b/sources/thelib/src/protocols/rtmp/messagefactories/connectionmessagefactory.cpp
@@ -127,7 +127,7 @@ Variant ConnectionMessageFactory::GetInvokeConnectError(uint32_t channelId, uint
Variant ConnectionMessageFactory::GetInvokeConnectError(Variant request,
string decription, string level, string code) {
- double objectEncoding = 0;
+ double objectEncoding __attribute__((unused)) = 0;
if (M_INVOKE_PARAM(request, 0).HasKey(RM_INVOKE_PARAMS_RESULT_OBJECTENCODING))
objectEncoding = M_INVOKE_PARAM(request, 0)[RM_INVOKE_PARAMS_RESULT_OBJECTENCODING];
return GetInvokeConnectError(
diff --git a/builders/cmake/crtmpserver/crtmpserver.lua b/builders/cmake/crtmpserver/crtmpserver.lua
index e842659..9faea91 100644
--- a/builders/cmake/crtmpserver/crtmpserver.lua
+++ b/builders/cmake/crtmpserver/crtmpserver.lua
@@ -105,7 +105,7 @@ configuration=
description="FLV Playback Sample",
name="flvplayback",
protocol="dynamiclinklibrary",
- mediaFolder="/Volumes/android/backup/media/",
+ mediaFolder="/home/josh/Desktop",
aliases=
{
"simpleLive",
@@ -133,12 +133,12 @@ configuration=
port=7654,
protocol="inboundRawHttpStream",
crossDomainFile="/tmp/crossdomain.xml"
- },
+ },]]--
{
ip="0.0.0.0",
- port=554,
+ port=8554,
protocol="inboundRtsp"
- },]]--
+ },
},
externalStreams =
{
@@ -163,13 +163,14 @@ configuration=
--generateMetaFiles=true, --this will generate seek/meta files on application startup
--renameBadFiles=false,
--enableCheckBandwidth=true,
- authentication=
+ --[[authentication=
{
rtmp={
type="adobe",
encoderAgents=
{
"FMLE/3.0 (compatible; FMSc/1.0)",
+ "FMLE/3.0 (compatible; Lavf53.8.0)",
"My user agent",
},
usersFile="users.lua"
@@ -177,7 +178,7 @@ configuration=
rtsp={
usersFile="users.lua"
}
- },
+ },--]]
},
{
name="samplefactory",
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment