From: Howard Chu Date: Tue, 30 Oct 2012 15:50:34 +0000 (-0700) Subject: Cleanup prev commit X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=294135e6eafeb1ac338ac4bb11ebd5ef62c748b9;p=rtmpdump Cleanup prev commit --- diff --git a/librtmp/amf.c b/librtmp/amf.c index 1406be4..563486c 100644 --- a/librtmp/amf.c +++ b/librtmp/amf.c @@ -396,14 +396,14 @@ AMFProp_Encode(AMFObjectProperty *prop, char *pBuffer, char *pBufEnd) pBuffer = AMF_Encode(&prop->p_vu.p_object, pBuffer, pBufEnd); break; - case AMF_ECMA_ARRAY: + case AMF_ECMA_ARRAY: pBuffer = AMF_EncodeEcmaArray(&prop->p_vu.p_object, pBuffer, pBufEnd); break; - - case AMF_STRICT_ARRAY: + + case AMF_STRICT_ARRAY: pBuffer = AMF_EncodeArray(&prop->p_vu.p_object, pBuffer, pBufEnd); break; - + default: RTMP_Log(RTMP_LOGERROR, "%s, invalid type. %d", __FUNCTION__, prop->p_type); pBuffer = NULL; @@ -708,7 +708,6 @@ AMFProp_Decode(AMFObjectProperty *prop, const char *pBuffer, int nSize, if (nRes == -1) return -1; nSize -= nRes; - //prop->p_type = AMF_OBJECT; break; } case AMF_OBJECT_END: @@ -726,7 +725,6 @@ AMFProp_Decode(AMFObjectProperty *prop, const char *pBuffer, int nSize, if (nRes == -1) return -1; nSize -= nRes; - //prop->p_type = AMF_OBJECT; break; } case AMF_DATE: diff --git a/librtmp/amf.h b/librtmp/amf.h index 5a47d77..5de414b 100644 --- a/librtmp/amf.h +++ b/librtmp/amf.h @@ -106,7 +106,7 @@ extern "C" char *AMF_Encode(AMFObject * obj, char *pBuffer, char *pBufEnd); char *AMF_EncodeEcmaArray(AMFObject *obj, char *pBuffer, char *pBufEnd); char *AMF_EncodeArray(AMFObject *obj, char *pBuffer, char *pBufEnd); - + int AMF_Decode(AMFObject * obj, const char *pBuffer, int nSize, int bDecodeName); int AMF_DecodeArray(AMFObject * obj, const char *pBuffer, int nSize,