diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-18 22:10:55 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-12-18 22:10:55 +0000 |
| commit | 963d0cd549592ab7f6217f77e660c3aee608d925 (patch) | |
| tree | 07e7919eac8f286eb1e0c47bae6fad7a72bb2849 | |
| parent | 6cc2764fdd7140d7c81265e86cc7c5dca3fe6623 (diff) | |
| parent | d07126f6c39b8dd5b492c37151a054837ddde7bc (diff) | |
| download | libmix-963d0cd549592ab7f6217f77e660c3aee608d925.tar.gz | |
am d07126f6: Suppress clang compiler warnings before upstream fix.
* commit 'd07126f6c39b8dd5b492c37151a054837ddde7bc':
Suppress clang compiler warnings before upstream fix.
| -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 |