diff options
| author | Chih-Hung Hsieh <chh@google.com> | 2014-12-18 15:32:32 -0800 |
|---|---|---|
| committer | Chih-Hung Hsieh <chh@google.com> | 2014-12-18 15:32:32 -0800 |
| commit | 6d9e8b016642da221906cb3cbe106a4d321ebd89 (patch) | |
| tree | a051230178a4c3cfd7d2666c79172868d9ab8b99 | |
| parent | 978624ed498354749b8e74ee80cbf7844a30c484 (diff) | |
| parent | bcf10222de27ba3a2dd9c23cb76f45ba4cfcf7c3 (diff) | |
| download | android_hardware_intel_common_omx-components-6d9e8b016642da221906cb3cbe106a4d321ebd89.tar.gz android_hardware_intel_common_omx-components-6d9e8b016642da221906cb3cbe106a4d321ebd89.tar.bz2 android_hardware_intel_common_omx-components-6d9e8b016642da221906cb3cbe106a4d321ebd89.zip | |
resolved conflicts for merge of bcf10222 to lmp-mr1-dev-plus-aosp
Change-Id: Id7d7b4429dcaefa20dd1f1d8546037febf0ee4ac
| -rw-r--r-- | videocodec/Android.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/videocodec/Android.mk b/videocodec/Android.mk index d3b3366..6a79dd0 100644 --- a/videocodec/Android.mk +++ b/videocodec/Android.mk @@ -227,6 +227,9 @@ LOCAL_CFLAGS += -Werror LOCAL_MODULE_TAGS := optional LOCAL_MODULE := libOMXVideoDecoderVP9Hybrid +# OMXVideoDecoderVP9Hybrid.h hides overloaded virtual function FillRenderBuffer. +LOCAL_CLANG_CFLAGS += -Wno-overloaded-virtual + ifeq ($(TARGET_BOARD_PLATFORM),merrifield) LOCAL_CFLAGS += -DVED_TILING endif |