Merge branch 'master' of https://github.com/FreeRDP/FreeRDP

Author: cedrozor

libfreerdp/core/gcc.c

@@ -1985,11 +1985,8 @@ void gcc_write_client_multitransport_channel_data(wStream* s, rdpMcs* mcs)
 {
 	rdpSettings* settings = mcs->settings;
 
-	if (settings->MultitransportFlags != 0)
-	{
-		gcc_write_user_data_header(s, CS_MULTITRANSPORT, 8);
-		Stream_Write_UINT32(s, settings->MultitransportFlags); /* flags */
-	}
+	gcc_write_user_data_header(s, CS_MULTITRANSPORT, 8);
+	Stream_Write_UINT32(s, settings->MultitransportFlags); /* flags */
 }
 
 BOOL gcc_read_server_multitransport_channel_data(wStream* s, rdpMcs* mcs)

libfreerdp/primitives/prim_YCoCg_opt.c

@@ -428,7 +428,7 @@ static pstatus_t ssse3_YCoCgRToRGB_8u_AC4R(const BYTE* pSrc, INT32 srcStep, BYTE
 
 static pstatus_t neon_YCoCgToRGB_8u_X(const BYTE* pSrc, INT32 srcStep, BYTE* pDst, UINT32 DstFormat,
                                       INT32 dstStep, UINT32 width, UINT32 height, UINT8 shift,
-                                      BYTE rPos, BYTE gPos, BYTE bPos, BYTE aPos, BOOL alpha)
+                                      BYTE bPos, BYTE gPos, BYTE rPos, BYTE aPos, BOOL alpha)
 {
 	UINT32 y;
 	BYTE* dptr = pDst;