diff options
| author | Dmitry Kovalev <dkovalev@google.com> | 2014-08-25 14:02:53 -0700 |
|---|---|---|
| committer | Dmitry Kovalev <dkovalev@google.com> | 2014-08-25 14:08:14 -0700 |
| commit | 446096571990a1f0db0545e156bc4ca1b2df92e0 (patch) | |
| tree | 5a9c91a4b9745e7def332e2587d24e1292fbfa46 | |
| parent | eba83a0fdb40df3b81193ce44c87a0e0a5e9f44e (diff) | |
| download | libvpx-446096571990a1f0db0545e156bc4ca1b2df92e0.tar libvpx-446096571990a1f0db0545e156bc4ca1b2df92e0.tar.gz libvpx-446096571990a1f0db0545e156bc4ca1b2df92e0.tar.bz2 libvpx-446096571990a1f0db0545e156bc4ca1b2df92e0.zip | |
Passing const cfg pointer to vpx_codec_{dec,enc}_init_ver().
Change-Id: I3e319f581215ccb814afca247c1d911be231a4ac
| -rw-r--r-- | vpx/src/vpx_decoder.c | 2 | ||||
| -rw-r--r-- | vpx/src/vpx_encoder.c | 2 | ||||
| -rw-r--r-- | vpx/vpx_codec.h | 8 | ||||
| -rw-r--r-- | vpx/vpx_decoder.h | 2 | ||||
| -rw-r--r-- | vpx/vpx_encoder.h | 2 |
5 files changed, 9 insertions, 7 deletions
diff --git a/vpx/src/vpx_decoder.c b/vpx/src/vpx_decoder.c index b19c4409f..fdcc9c1b1 100644 --- a/vpx/src/vpx_decoder.c +++ b/vpx/src/vpx_decoder.c @@ -20,7 +20,7 @@ vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_iface_t *iface, - vpx_codec_dec_cfg_t *cfg, + const vpx_codec_dec_cfg_t *cfg, vpx_codec_flags_t flags, int ver) { vpx_codec_err_t res; diff --git a/vpx/src/vpx_encoder.c b/vpx/src/vpx_encoder.c index 577345535..736a8daa2 100644 --- a/vpx/src/vpx_encoder.c +++ b/vpx/src/vpx_encoder.c @@ -22,7 +22,7 @@ vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_iface_t *iface, - vpx_codec_enc_cfg_t *cfg, + const vpx_codec_enc_cfg_t *cfg, vpx_codec_flags_t flags, int ver) { vpx_codec_err_t res; diff --git a/vpx/vpx_codec.h b/vpx/vpx_codec.h index 07df72a78..91fc532b5 100644 --- a/vpx/vpx_codec.h +++ b/vpx/vpx_codec.h @@ -203,9 +203,11 @@ extern "C" { const char *err_detail; /**< Detailed info, if available */ vpx_codec_flags_t init_flags; /**< Flags passed at init time */ union { - struct vpx_codec_dec_cfg *dec; /**< Decoder Configuration Pointer */ - struct vpx_codec_enc_cfg *enc; /**< Encoder Configuration Pointer */ - void *raw; + /**< Decoder Configuration Pointer */ + const struct vpx_codec_dec_cfg *dec; + /**< Encoder Configuration Pointer */ + const struct vpx_codec_enc_cfg *enc; + const void *raw; } config; /**< Configuration pointer aliasing union */ vpx_codec_priv_t *priv; /**< Algorithm private storage */ } vpx_codec_ctx_t; diff --git a/vpx/vpx_decoder.h b/vpx/vpx_decoder.h index 10b89fa0f..62fd91975 100644 --- a/vpx/vpx_decoder.h +++ b/vpx/vpx_decoder.h @@ -135,7 +135,7 @@ extern "C" { */ vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_iface_t *iface, - vpx_codec_dec_cfg_t *cfg, + const vpx_codec_dec_cfg_t *cfg, vpx_codec_flags_t flags, int ver); diff --git a/vpx/vpx_encoder.h b/vpx/vpx_encoder.h index 58acf18a8..75d3a47b1 100644 --- a/vpx/vpx_encoder.h +++ b/vpx/vpx_encoder.h @@ -715,7 +715,7 @@ extern "C" { */ vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_iface_t *iface, - vpx_codec_enc_cfg_t *cfg, + const vpx_codec_enc_cfg_t *cfg, vpx_codec_flags_t flags, int ver); |