jp9000/obs-studio
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "Revert "obs-outputs: Update to latest librtmp version""

Browse Source 
This reverts commit ac72e0392d.
This commit is contained in:
Palana
2015-02-11 16:24:26 +01:00
parent bda7cfc3ed
commit b7375fd1be
4 changed files with 109 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
plugins/obs-outputs/librtmp/amf.c
View File

@@ -483,6 +483,7 @@ AMF3ReadString(const char *data, AVal *str)
return len + nSize;
}
return len;
}
int
@@ -504,7 +505,7 @@ AMF3Prop_Decode(AMFObjectProperty *prop, const char *pBuffer, int nSize,
/* decode name */
if (bDecodeName)
{
AVal name;
AVal name = AV_empty;
int nRes = AMF3ReadString(pBuffer, &name);
if (name.av_len <= 0)
@@ -863,7 +864,7 @@ AMFProp_Dump(AMFObjectProperty *prop)
void
AMFProp_Reset(AMFObjectProperty *prop)
{
if (prop->p_type == AMF_OBJECT)
if (prop->p_type == AMF_OBJECT || prop->p_type == AMF_ECMA_ARRAY || prop->p_type == AMF_STRICT_ARRAY)
AMF_Reset(&prop->p_vu.p_object);
else
{
@@ -1078,7 +1079,7 @@ AMF3_Decode(AMFObject *obj, const char *pBuffer, int nSize, int bAMFData)
for (i = 0; i < cd.cd_num; i++)
{
AVal memberName;
AVal memberName = AV_empty;
len = AMF3ReadString(pBuffer, &memberName);
RTMP_Log(RTMP_LOGDEBUG, "Member: %s", memberName.av_val);
AMF3CD_AddProp(&cd, &memberName);