diff options
| -rw-r--r-- | videodecoder/Android.mk | 4 | ||||
| -rw-r--r-- | videoencoder/Android.mk | 6 |
2 files changed, 10 insertions, 0 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/videoencoder/Android.mk b/videoencoder/Android.mk index 487ebfc..cb8528f 100644 --- a/videoencoder/Android.mk +++ b/videoencoder/Android.mk @@ -21,6 +21,12 @@ LOCAL_SRC_FILES := \ VideoEncoderUtils.cpp \ VideoEncoderHost.cpp +# VideoEncoderAVC.cpp has extraneous parentheses and +# uses va_enc_h264.h with empty union. +LOCAL_CLANG_CFLAGS += \ + -Wno-parentheses-equality \ + -Wno-extern-c-compat + ifeq ($(ENABLE_IMG_GRAPHICS),) LOCAL_SRC_FILES += PVSoftMPEG4Encoder.cpp endif |