diff --git a/limelight-common/ControlStream.c b/limelight-common/ControlStream.c
index f88982e..4dd635d 100644
--- a/limelight-common/ControlStream.c
+++ b/limelight-common/ControlStream.c
@@ -136,7 +136,7 @@ static void jitterThreadFunc(void* context) {
 }
 
 static void resyncThreadFunc(void* context) {
-	long payload[2];
+	long long payload[2];
 	NVCTL_PACKET_HEADER header;
 	int err;
 
diff --git a/limelight-common/VideoDepacketizer.c b/limelight-common/VideoDepacketizer.c
index 49c607d..5764bee 100644
--- a/limelight-common/VideoDepacketizer.c
+++ b/limelight-common/VideoDepacketizer.c
@@ -163,9 +163,9 @@ void processRtpPayload(PNV_VIDEO_PACKET videoPacket, int length) {
 
 		if (getSpecialSeq(&currentPos, &specialSeq)) {
 			if (isSeqAvcStart(&specialSeq)) {
-				if (isSeqFrameStart(&specialSeq)) {
-					decodingAvc = 1;
+				decodingAvc = 1;
 
+				if (isSeqFrameStart(&specialSeq)) {
 					reassembleFrame();
 				}