diff --git a/src/video_engine/main/source/vie_channel.cc b/src/video_engine/main/source/vie_channel.cc
index e4a988740f..f813411cc3 100644
--- a/src/video_engine/main/source/vie_channel.cc
+++ b/src/video_engine/main/source/vie_channel.cc
@@ -76,7 +76,7 @@ ViEChannel::ViEChannel(WebRtc_Word32 channelId, WebRtc_Word32 engineId,
         _ptrExternalTransport(NULL),
         _decoderReset(true),
         _waitForKeyFrame(false),
-        _ptrDecodeThread(false),
+        _ptrDecodeThread(NULL),
         _ptrSrtpModuleEncryption(NULL),
         _ptrSrtpModuleDecryption(NULL),
         _ptrExternalEncryption(NULL),
diff --git a/src/video_engine/main/test/AutoTest/interface/tb_I420_codec.h b/src/video_engine/main/test/AutoTest/interface/tb_I420_codec.h
index 62559d4e59..107048d7cb 100644
--- a/src/video_engine/main/test/AutoTest/interface/tb_I420_codec.h
+++ b/src/video_engine/main/test/AutoTest/interface/tb_I420_codec.h
@@ -38,10 +38,10 @@ public:
                                      WebRtc_Word32 numberOfCores,
                                      WebRtc_UWord32 maxPayloadSize);
 
-    virtual WebRtc_Word32 Encode(const webrtc::RawImage& inputImage,
-                                 const void* codecSpecificInfo = NULL,
-                                 webrtc::VideoFrameType frameType =
-                                     webrtc::kDeltaFrame);
+    virtual WebRtc_Word32 Encode(
+        const webrtc::RawImage& inputImage,
+        const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL,
+        webrtc::VideoFrameType frameType = webrtc::kDeltaFrame);
 
     virtual WebRtc_Word32 RegisterEncodeCompleteCallback(
         webrtc::EncodedImageCallback* callback);
@@ -98,10 +98,12 @@ public:
 
     virtual WebRtc_Word32 InitDecode(const webrtc::VideoCodec* inst,
                                      WebRtc_Word32 numberOfCores);
-    virtual WebRtc_Word32 Decode(const webrtc::EncodedImage& inputImage,
-                                 bool missingFrames,
-                                 const void* codecSpecificInfo = NULL,
-                                 WebRtc_Word64 renderTimeMs = -1);
+    virtual WebRtc_Word32 Decode(
+        const webrtc::EncodedImage& inputImage,
+        bool missingFrames,
+        const webrtc::CodecSpecificInfo* codecSpecificInfo = NULL,
+        WebRtc_Word64 renderTimeMs = -1);
+
     virtual WebRtc_Word32
         RegisterDecodeCompleteCallback(webrtc::DecodedImageCallback* callback);
     virtual WebRtc_Word32 Release();
diff --git a/src/video_engine/main/test/AutoTest/source/tb_I420_codec.cc b/src/video_engine/main/test/AutoTest/source/tb_I420_codec.cc
index cdbc244d53..4a58bff62c 100644
--- a/src/video_engine/main/test/AutoTest/source/tb_I420_codec.cc
+++ b/src/video_engine/main/test/AutoTest/source/tb_I420_codec.cc
@@ -114,10 +114,10 @@ WebRtc_Word32 tbI420Encoder::InitEncode(const webrtc::VideoCodec* inst,
     return WEBRTC_VIDEO_CODEC_OK;
 }
 
-WebRtc_Word32 tbI420Encoder::Encode(const webrtc::RawImage& inputImage,
-                                    const void* codecSpecificInfo /*= NULL*/,
-                                    webrtc::VideoFrameType frameType
-                                    /*= webrtc::kDeltaFrame*/)
+WebRtc_Word32 tbI420Encoder::Encode(
+    const webrtc::RawImage& inputImage,
+    const webrtc::CodecSpecificInfo* codecSpecificInfo /*= NULL*/,
+    webrtc::VideoFrameType frameType /*= webrtc::kDeltaFrame*/)
 {
     _functionCalls.Encode++;
     if (!_inited)
@@ -234,10 +234,11 @@ WebRtc_Word32 tbI420Decoder::InitDecode(const webrtc::VideoCodec* inst,
     return WEBRTC_VIDEO_CODEC_OK;
 }
 
-WebRtc_Word32 tbI420Decoder::Decode(const webrtc::EncodedImage& inputImage,
-                                    bool /*missingFrames*/,
-                                    const void* /*codecSpecificInfWord64o*/,
-                                    WebRtc_Word64 /*renderTimeMs*/)
+WebRtc_Word32 tbI420Decoder::Decode(
+    const webrtc::EncodedImage& inputImage,
+    bool /*missingFrames*/,
+    const webrtc::CodecSpecificInfo* /*codecSpecificInfWord64o*/,
+    WebRtc_Word64 /*renderTimeMs*/)
 {
     _functionCalls.Decode++;
     if (inputImage._buffer == NULL)