aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Hung Hsieh <chh@google.com>2014-12-18 22:10:53 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-12-18 22:10:53 +0000
commit978624ed498354749b8e74ee80cbf7844a30c484 (patch)
treeb6314bd21e96dfa7824dde522e1730276cbe0751
parentb41f9e39fcc4de1c003596a4d810f13179a100d0 (diff)
parentaf3c298ce2c1ab2ed8a3ae40fdce68e6440fc860 (diff)
downloadandroid_hardware_intel_common_omx-components-978624ed498354749b8e74ee80cbf7844a30c484.tar.gz
android_hardware_intel_common_omx-components-978624ed498354749b8e74ee80cbf7844a30c484.tar.bz2
android_hardware_intel_common_omx-components-978624ed498354749b8e74ee80cbf7844a30c484.zip
am af3c298c: Suppress some clang compiler warnings.
* commit 'af3c298ce2c1ab2ed8a3ae40fdce68e6440fc860': Suppress some clang compiler warnings.
-rw-r--r--videocodec/libvpx_internal/libvpx.mk4
-rw-r--r--videocodec/libvpx_internal/libvpx/vp8/decoder/onyxd_if.c4
-rw-r--r--videocodec/libvpx_internal/libvpx/vp8/encoder/pickinter.c2
3 files changed, 7 insertions, 3 deletions
diff --git a/videocodec/libvpx_internal/libvpx.mk b/videocodec/libvpx_internal/libvpx.mk
index 633c848..5a95803 100644
--- a/videocodec/libvpx_internal/libvpx.mk
+++ b/videocodec/libvpx_internal/libvpx.mk
@@ -46,6 +46,10 @@ LOCAL_CFLAGS := -DHAVE_CONFIG_H=vpx_config.h
# Static functions declared in headers. b/18632512
LOCAL_CFLAGS += -Wno-unused-function
+# Clang complains about every partial initialized structure,
+# in vp[89]_[cd]x_iface.c
+LOCAL_CLANG_CFLAGS += -Wno-missing-field-initializers
+
LOCAL_CFLAGS += -Werror
LOCAL_MODULE := libvpx_internal
diff --git a/videocodec/libvpx_internal/libvpx/vp8/decoder/onyxd_if.c b/videocodec/libvpx_internal/libvpx/vp8/decoder/onyxd_if.c
index 8e3deeb..35b541e 100644
--- a/videocodec/libvpx_internal/libvpx/vp8/decoder/onyxd_if.c
+++ b/videocodec/libvpx_internal/libvpx/vp8/decoder/onyxd_if.c
@@ -313,8 +313,8 @@ int vp8dx_receive_compressed_data(VP8D_COMP *pbi, size_t size,
VP8_COMMON *cm = &pbi->common;
volatile int retcode;
- size = size; // to remove warning
- source = source;
+ (void) size;
+ (void) source;
pbi->common.error.error_code = VPX_CODEC_OK;
retcode = check_fragments_for_errors(pbi);
diff --git a/videocodec/libvpx_internal/libvpx/vp8/encoder/pickinter.c b/videocodec/libvpx_internal/libvpx/vp8/encoder/pickinter.c
index 53c140f..6f09d78 100644
--- a/videocodec/libvpx_internal/libvpx/vp8/encoder/pickinter.c
+++ b/videocodec/libvpx_internal/libvpx/vp8/encoder/pickinter.c
@@ -55,7 +55,7 @@ int vp8_skip_fractional_mv_step(MACROBLOCK *mb, BLOCK *b, BLOCKD *d,
(void) mvcost;
(void) distortion;
(void) sse;
- mb = mb; // remove warning
+ (void) mb;
bestmv->as_mv.row <<= 3;
bestmv->as_mv.col <<= 3;
return 0;