3 files changed, 9 insertions, 6 deletions
diff --git a/videodecoder/Android.mk b/videodecoder/Android.mk
index d3ff4f2..c9eaeb4 100644
--- a/videodecoder/Android.mk
+++ b/videodecoder/Android.mk
@@ -14,6 +14,10 @@ LOCAL_SRC_FILES := \
     VideoDecoderAVC.cpp \
     VideoDecoderTrace.cpp
 
+# VideoDecoderHost.cpp includes VideoDecoderWMV.h,
+# which hides overloaded virtual function parseBuffer.
+LOCAL_CLANG_CFLAGS += -Wno-overloaded-virtual
+
 LOCAL_C_INCLUDES := \
     $(TARGET_OUT_HEADERS)/libva \
     $(TARGET_OUT_HEADERS)/libmixvbp
diff --git a/videodecoder/VideoDecoderBase.cpp b/videodecoder/VideoDecoderBase.cpp
index 19b3c5e..291441f 100644
--- a/videodecoder/VideoDecoderBase.cpp
+++ b/videodecoder/VideoDecoderBase.cpp
@@ -259,7 +259,6 @@ const VideoFormatInfo* VideoDecoderBase::getFormatInfo(void) {
 }
 
 const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBuffer *outErrBuf) {
-    VAStatus vaStatus;
     if (mVAStarted == false) {
         return NULL;
     }
@@ -282,7 +281,7 @@ const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBu
         if (mOutputHead == NULL) {
             mOutputTail = NULL;
         }
-        vaStatus = vaSetTimestampForSurface(mVADisplay, outputByPos->renderBuffer.surface, outputByPos->renderBuffer.timeStamp);
+        vaSetTimestampForSurface(mVADisplay, outputByPos->renderBuffer.surface, outputByPos->renderBuffer.timeStamp);
         if (useGraphicBuffer && !mUseGEN) {
             vaSyncSurface(mVADisplay, outputByPos->renderBuffer.surface);
             fillDecodingErrors(&(outputByPos->renderBuffer));
@@ -327,7 +326,7 @@ const VideoRenderBuffer* VideoDecoderBase::getOutput(bool draining, VideoErrorBu
         }
     }
     //VTRACE("Output POC %d for display (pts = %.2f)", output->pictureOrder, output->renderBuffer.timeStamp/1E6);
-    vaStatus = vaSetTimestampForSurface(mVADisplay, output->renderBuffer.surface, output->renderBuffer.timeStamp);
+    vaSetTimestampForSurface(mVADisplay, output->renderBuffer.surface, output->renderBuffer.timeStamp);
 
     if (useGraphicBuffer && !mUseGEN) {
         vaSyncSurface(mVADisplay, output->renderBuffer.surface);
@@ -757,7 +756,6 @@ exit:
 Decode_Status VideoDecoderBase::setupVA(uint32_t numSurface, VAProfile profile, uint32_t numExtraSurface) {
     VAStatus vaStatus = VA_STATUS_SUCCESS;
     Decode_Status status;
-    VAConfigAttrib attrib;
 
     if (mVAStarted) {
         return DECODE_SUCCESS;
@@ -836,6 +834,7 @@ Decode_Status VideoDecoderBase::setupVA(uint32_t numSurface, VAProfile profile,
         status = getCodecSpecificConfigs(profile, &mVAConfig);
         CHECK_STATUS("getCodecSpecificAttributes");
 #else
+        VAConfigAttrib attrib;
         //We are requesting RT attributes
         attrib.type = VAConfigAttribRTFormat;
         attrib.value = VA_RT_FORMAT_YUV420;
@@ -1137,7 +1136,6 @@ Decode_Status VideoDecoderBase::getRawDataFromSurface(VideoRenderBuffer *renderB
     }
 
     VAStatus vaStatus;
-    VAImageFormat imageFormat;
     VAImage vaImage;
     vaStatus = vaSyncSurface(renderBuffer->display, renderBuffer->surface);
     CHECK_VA_STATUS("vaSyncSurface");
diff --git a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
index 029484c..3313c40 100644
--- a/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
+++ b/videodecoder/securevideo/moorefield/VideoDecoderAVCSecure.cpp
@@ -22,6 +22,8 @@
 #include "VideoDecoderAVCSecure.h"
 #include "VideoFrameInfo.h"
 
+#include <string.h>
+
 #define MAX_SLICEHEADER_BUFFER_SIZE 4096
 #define STARTCODE_PREFIX_LEN        3
 #define NALU_TYPE_MASK              0x1F
@@ -233,7 +235,6 @@ Decode_Status VideoDecoderAVCSecure::processClassicInputBuffer(VideoDecodeBuffer
     uint8_t naluType = 0;
 
     int32_t num_nalus;
-    int32_t nalu_offset;
     int32_t offset;
     uint8_t *data_src;
     uint8_t *nalu_data;