Commit d0e384e3 authored by Dmitry Kovalev's avatar Dmitry Kovalev Committed by Gerrit Code Review
Browse files

Merge "Passing const cfg pointer to vpx_codec_{dec,enc}_init_ver()."

parents 42ad07a1 44609657
...@@ -20,7 +20,7 @@ ...@@ -20,7 +20,7 @@
vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t *ctx,
vpx_codec_iface_t *iface, vpx_codec_iface_t *iface,
vpx_codec_dec_cfg_t *cfg, const vpx_codec_dec_cfg_t *cfg,
vpx_codec_flags_t flags, vpx_codec_flags_t flags,
int ver) { int ver) {
vpx_codec_err_t res; vpx_codec_err_t res;
......
...@@ -22,7 +22,7 @@ ...@@ -22,7 +22,7 @@
vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx,
vpx_codec_iface_t *iface, vpx_codec_iface_t *iface,
vpx_codec_enc_cfg_t *cfg, const vpx_codec_enc_cfg_t *cfg,
vpx_codec_flags_t flags, vpx_codec_flags_t flags,
int ver) { int ver) {
vpx_codec_err_t res; vpx_codec_err_t res;
......
...@@ -203,9 +203,11 @@ extern "C" { ...@@ -203,9 +203,11 @@ extern "C" {
const char *err_detail; /**< Detailed info, if available */ const char *err_detail; /**< Detailed info, if available */
vpx_codec_flags_t init_flags; /**< Flags passed at init time */ vpx_codec_flags_t init_flags; /**< Flags passed at init time */
union { union {
struct vpx_codec_dec_cfg *dec; /**< Decoder Configuration Pointer */ /**< Decoder Configuration Pointer */
struct vpx_codec_enc_cfg *enc; /**< Encoder Configuration Pointer */ const struct vpx_codec_dec_cfg *dec;
void *raw; /**< Encoder Configuration Pointer */
const struct vpx_codec_enc_cfg *enc;
const void *raw;
} config; /**< Configuration pointer aliasing union */ } config; /**< Configuration pointer aliasing union */
vpx_codec_priv_t *priv; /**< Algorithm private storage */ vpx_codec_priv_t *priv; /**< Algorithm private storage */
} vpx_codec_ctx_t; } vpx_codec_ctx_t;
......
...@@ -135,7 +135,7 @@ extern "C" { ...@@ -135,7 +135,7 @@ extern "C" {
*/ */
vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_err_t vpx_codec_dec_init_ver(vpx_codec_ctx_t *ctx,
vpx_codec_iface_t *iface, vpx_codec_iface_t *iface,
vpx_codec_dec_cfg_t *cfg, const vpx_codec_dec_cfg_t *cfg,
vpx_codec_flags_t flags, vpx_codec_flags_t flags,
int ver); int ver);
......
...@@ -715,7 +715,7 @@ extern "C" { ...@@ -715,7 +715,7 @@ extern "C" {
*/ */
vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx, vpx_codec_err_t vpx_codec_enc_init_ver(vpx_codec_ctx_t *ctx,
vpx_codec_iface_t *iface, vpx_codec_iface_t *iface,
vpx_codec_enc_cfg_t *cfg, const vpx_codec_enc_cfg_t *cfg,
vpx_codec_flags_t flags, vpx_codec_flags_t flags,
int ver); int ver);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment