diff --git a/src/modules/rtp_rtcp/source/rtp_sender.cc b/src/modules/rtp_rtcp/source/rtp_sender.cc index 8711b0aeb3..eb7222cc11 100644 --- a/src/modules/rtp_rtcp/source/rtp_sender.cc +++ b/src/modules/rtp_rtcp/source/rtp_sender.cc @@ -1463,7 +1463,7 @@ RTPSender::RED(WebRtc_Word8& payloadType) const { if(!_audioConfigured) { - return NULL; + return 0; } return _audio->RED(payloadType); } diff --git a/src/modules/rtp_rtcp/source/rtp_utility.cc b/src/modules/rtp_rtcp/source/rtp_utility.cc index 70062afd9f..d3df0f3165 100644 --- a/src/modules/rtp_rtcp/source/rtp_utility.cc +++ b/src/modules/rtp_rtcp/source/rtp_utility.cc @@ -634,9 +634,6 @@ ModuleRTPUtility::RTPPayloadParser::ParseH263(RTPPayload& parsedPacket) const const WebRtc_UWord8 header1 = _dataPtr[0]; const WebRtc_UWord8 header2 = _dataPtr[1]; - bool modeA = false; - bool modeB = false; - bool modeC = false; parsedPacket.frameType = ((header2 & 0x10) == 0) ? kIFrame : kPFrame; @@ -644,7 +641,6 @@ ModuleRTPUtility::RTPPayloadParser::ParseH263(RTPPayload& parsedPacket) const if ((header1 & 0x80) == 0) { // Mode A - modeA = true; h263HeaderLength = 4; } else @@ -655,12 +651,13 @@ ModuleRTPUtility::RTPPayloadParser::ParseH263(RTPPayload& parsedPacket) const if((header1 & 0x40) == 0) { - // IMPROVEMENT use the information in the H263 header? GQuant of the first MB - modeB = true; + // Mode B + // IMPROVEMENT use the information in the H263 header? + // GQuant of the first MB h263HeaderLength = 8; }else { - modeC = true; + // Mode C h263HeaderLength = 12; } }