ref: 68991d7f87cbea90929e9fc941c9aec96c9c892c
parent: f68cf8ba1923ea7252df8f2800d0e770991b6d9d
parent: 27b5cc31e660f2edc9800cce498df8db012a08a7
author: James Bankoski <jimbankoski@google.com>
date: Mon Nov 28 17:27:25 EST 2016
Merge "svc_test: fix two warnings"
--- a/test/svc_test.cc
+++ b/test/svc_test.cc
@@ -438,7 +438,7 @@
// Test that decoder can handle an SVC frame as the first frame in a sequence.
TEST_F(SvcTest, OnePassEncodeOneFrame) {
codec_enc_.g_pass = VPX_RC_ONE_PASS;
- vpx_fixed_buf output = { 0 };
+ vpx_fixed_buf output = vpx_fixed_buf();
Pass2EncodeNFrames(NULL, 1, 2, &output);
DecodeNFrames(&output, 1);
FreeBitstreamBuffers(&output, 1);
--- a/vpx/src/svc_encodeframe.c
+++ b/vpx/src/svc_encodeframe.c
@@ -201,7 +201,7 @@
char *input_string;
char *option_name;
char *option_value;
- char *input_ptr;
+ char *input_ptr = NULL;
SvcInternal_t *const si = get_svc_internal(svc_ctx);
vpx_codec_err_t res = VPX_CODEC_OK;
int i, alt_ref_enabled = 0;