diff options
| author | Johann Koenig <johannkoenig@google.com> | 2016-06-16 23:12:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-16 23:12:06 +0000 |
| commit | ee30cf14089c36d403572f7e7e4a9eb5db69a4ef (patch) | |
| tree | 387256aa55c8f79f1d5653c9fe04d54b5576252c | |
| parent | f5713fefa688ffcef68ea83a166f93cd25b2d4bc (diff) | |
| parent | 6f9982e3c27598cb7958fdb0a43217ab10cfb5b9 (diff) | |
| download | libvpx-ee30cf14089c36d403572f7e7e4a9eb5db69a4ef.tar libvpx-ee30cf14089c36d403572f7e7e4a9eb5db69a4ef.tar.gz libvpx-ee30cf14089c36d403572f7e7e4a9eb5db69a4ef.tar.bz2 libvpx-ee30cf14089c36d403572f7e7e4a9eb5db69a4ef.zip | |
Merge "vp8_[cd]x_iface.c: Initialize structures to 0"
| -rw-r--r-- | vp8/vp8_cx_iface.c | 10 | ||||
| -rw-r--r-- | vp8/vp8_dx_iface.c | 16 |
2 files changed, 16 insertions, 10 deletions
diff --git a/vp8/vp8_cx_iface.c b/vp8/vp8_cx_iface.c index 54d45479e..75af40a00 100644 --- a/vp8/vp8_cx_iface.c +++ b/vp8/vp8_cx_iface.c @@ -22,6 +22,7 @@ #include "vpx/vp8cx.h" #include "vp8/encoder/firstpass.h" #include "vp8/common/onyx.h" +#include "vp8/common/common.h" #include <stdlib.h> #include <string.h> @@ -1116,7 +1117,8 @@ static vpx_image_t *vp8e_get_preview(vpx_codec_alg_priv_t *ctx) { YV12_BUFFER_CONFIG sd; - vp8_ppflags_t flags = {0}; + vp8_ppflags_t flags; + vp8_zero(flags); if (ctx->preview_ppcfg.post_proc_flag) { @@ -1305,8 +1307,8 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] = 30, /* rc_resize_up_thresold */ VPX_VBR, /* rc_end_usage */ - {0}, /* rc_twopass_stats_in */ - {0}, /* rc_firstpass_mb_stats_in */ + {NULL, 0}, /* rc_twopass_stats_in */ + {NULL, 0}, /* rc_firstpass_mb_stats_in */ 256, /* rc_target_bandwidth */ 4, /* rc_min_quantizer */ 63, /* rc_max_quantizer */ @@ -1334,6 +1336,8 @@ static vpx_codec_enc_cfg_map_t vp8e_usage_cfg_map[] = {0}, /* ts_rate_decimator */ 0, /* ts_periodicity */ {0}, /* ts_layer_id */ + {0}, /* layer_target_bitrate */ + 0 /* temporal_layering_mode */ }}, }; diff --git a/vp8/vp8_dx_iface.c b/vp8/vp8_dx_iface.c index 9c78de198..fc9288d62 100644 --- a/vp8/vp8_dx_iface.c +++ b/vp8/vp8_dx_iface.c @@ -522,7 +522,8 @@ static vpx_image_t *vp8_get_frame(vpx_codec_alg_priv_t *ctx, { YV12_BUFFER_CONFIG sd; int64_t time_stamp = 0, time_end_stamp = 0; - vp8_ppflags_t flags = {0}; + vp8_ppflags_t flags; + vp8_zero(flags); if (ctx->base.init_flags & VPX_CODEC_USE_POSTPROC) { @@ -816,11 +817,12 @@ CODEC_INTERFACE(vpx_codec_vp8_dx) = }, { /* encoder functions */ 0, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL + NULL, /* vpx_codec_enc_cfg_map_t */ + NULL, /* vpx_codec_encode_fn_t */ + NULL, /* vpx_codec_get_cx_data_fn_t */ + NULL, /* vpx_codec_enc_config_set_fn_t */ + NULL, /* vpx_codec_get_global_headers_fn_t */ + NULL, /* vpx_codec_get_preview_frame_fn_t */ + NULL /* vpx_codec_enc_mr_get_mem_loc_fn_t */ } }; |