diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-18 11:49:34 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-12-18 11:49:34 -0800 |
| commit | d07126f6c39b8dd5b492c37151a054837ddde7bc (patch) | |
| tree | e327d6977b9fc64d1846c068633f6ae52e6bb489 | |
| parent | 661c5a76313015b6a3fea4b0e593b761a32f4372 (diff) | |
| download | libmix-d07126f6c39b8dd5b492c37151a054837ddde7bc.tar.gz | |
Suppress clang compiler warnings before upstream fix.
* va_enc_h264.h uses empty union, which has size 0 in C, size 1 in C++.
* VideoDecoderWMV.h hides overloaded virtual function parseBuffer.
* VideoDecoderHost.cpp has equality comparison with extraneous parentheses.
Change-Id: Ice44cf3647f1a1060467a63a1cd02892797e283c
| -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 53e3283..b8ef199 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 1fc4d9a..8294b9d 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 |