diff options
| author | James Zern <jzern@google.com> | 2014-12-18 18:48:30 -0800 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-12-18 18:48:30 -0800 |
| commit | b32ba09d3568492229da222740c0e18afc3f0094 (patch) | |
| tree | 166e50bf8f9a3597165533d0630ce6e889f3529b /vp9/vp9_cx_iface.c | |
| parent | 1c69be6e757d856298a427414b7e98d402557dd9 (diff) | |
| parent | cd6093081495b89d6c55b84ff3ef02fee19f85fc (diff) | |
| download | libvpx-b32ba09d3568492229da222740c0e18afc3f0094.tar libvpx-b32ba09d3568492229da222740c0e18afc3f0094.tar.gz libvpx-b32ba09d3568492229da222740c0e18afc3f0094.tar.bz2 libvpx-b32ba09d3568492229da222740c0e18afc3f0094.zip | |
Merge "make vp9 encoder static initializers thread safe"
Diffstat (limited to 'vp9/vp9_cx_iface.c')
| -rw-r--r-- | vp9/vp9_cx_iface.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp9/vp9_cx_iface.c b/vp9/vp9_cx_iface.c index f40dc7ff0..7b4b17809 100644 --- a/vp9/vp9_cx_iface.c +++ b/vp9/vp9_cx_iface.c @@ -13,6 +13,7 @@ #include "./vpx_config.h" #include "vpx/vpx_codec.h" +#include "vpx_ports/vpx_once.h" #include "vpx/internal/vpx_codec_internal.h" #include "./vpx_version.h" #include "vp9/encoder/vp9_encoder.h" @@ -729,7 +730,7 @@ static vpx_codec_err_t encoder_init(vpx_codec_ctx_t *ctx, } priv->extra_cfg = default_extra_cfg; - vp9_initialize_enc(); + once(vp9_initialize_enc); res = validate_config(priv, &priv->cfg, &priv->extra_cfg); |