diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-06-29 12:15:00 -0700 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-06-29 15:03:50 -0700 |
| commit | acd147c50c02e43b1426450033b71d8ad28e6b98 (patch) | |
| tree | 6f84b5f556b41392444ffcc3c5da6e95fd92c340 /vpx | |
| parent | e7bbedce5f2b9ecaeb4ebf1bfe446d8895cdf105 (diff) | |
| download | libvpx-acd147c50c02e43b1426450033b71d8ad28e6b98.tar libvpx-acd147c50c02e43b1426450033b71d8ad28e6b98.tar.gz libvpx-acd147c50c02e43b1426450033b71d8ad28e6b98.tar.bz2 libvpx-acd147c50c02e43b1426450033b71d8ad28e6b98.zip | |
Build unit test driver from the default target
We need an easy way to build the unit test driver without running the
tests. This enables passing options like --gtest_filter to the
executable, which can't be done very cleanly when running under
`make test`.
Fixed a number of compiler errors/warnings when building the tests
in various configurations by Jenkins.
Change-Id: I9198122600bcf02520688e5f052ab379f963b77b
Diffstat (limited to 'vpx')
| -rw-r--r-- | vpx/internal/vpx_codec_internal.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/vpx/internal/vpx_codec_internal.h b/vpx/internal/vpx_codec_internal.h index 0703d6a4f..447433111 100644 --- a/vpx/internal/vpx_codec_internal.h +++ b/vpx/internal/vpx_codec_internal.h @@ -165,7 +165,7 @@ typedef vpx_codec_err_t (*vpx_codec_control_fn_t)(vpx_codec_alg_priv_t *ctx, * mapping. This implies that ctrl_id values chosen by the algorithm * \ref MUST be non-zero. */ -typedef const struct +typedef const struct vpx_codec_ctrl_fn_map { int ctrl_id; vpx_codec_control_fn_t fn; @@ -280,7 +280,7 @@ typedef vpx_codec_err_t * one mapping must be present, in addition to the end-of-list. * */ -typedef const struct +typedef const struct vpx_codec_enc_cfg_map { int usage; vpx_codec_enc_cfg_t cfg; @@ -302,14 +302,14 @@ struct vpx_codec_iface vpx_codec_ctrl_fn_map_t *ctrl_maps; /**< \copydoc ::vpx_codec_ctrl_fn_map_t */ vpx_codec_get_mmap_fn_t get_mmap; /**< \copydoc ::vpx_codec_get_mmap_fn_t */ vpx_codec_set_mmap_fn_t set_mmap; /**< \copydoc ::vpx_codec_set_mmap_fn_t */ - struct + struct vpx_codec_dec_iface { vpx_codec_peek_si_fn_t peek_si; /**< \copydoc ::vpx_codec_peek_si_fn_t */ vpx_codec_get_si_fn_t get_si; /**< \copydoc ::vpx_codec_peek_si_fn_t */ vpx_codec_decode_fn_t decode; /**< \copydoc ::vpx_codec_decode_fn_t */ vpx_codec_get_frame_fn_t get_frame; /**< \copydoc ::vpx_codec_get_frame_fn_t */ } dec; - struct + struct vpx_codec_enc_iface { vpx_codec_enc_cfg_map_t *cfg_maps; /**< \copydoc ::vpx_codec_enc_cfg_map_t */ vpx_codec_encode_fn_t encode; /**< \copydoc ::vpx_codec_encode_fn_t */ |