Index: source/libvpx/vpxdec.c |
=================================================================== |
--- source/libvpx/vpxdec.c (revision 290053) |
+++ source/libvpx/vpxdec.c (working copy) |
@@ -123,8 +123,8 @@ |
}; |
#endif |
-static int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst, |
- FilterModeEnum mode) { |
+static INLINE int vpx_image_scale(vpx_image_t *src, vpx_image_t *dst, |
+ FilterModeEnum mode) { |
assert(src->fmt == VPX_IMG_FMT_I420); |
assert(dst->fmt == VPX_IMG_FMT_I420); |
return I420Scale(src->planes[VPX_PLANE_Y], src->stride[VPX_PLANE_Y], |
@@ -425,6 +425,7 @@ |
break; |
default: |
die("Unrecognized pattern %%%c\n", p[1]); |
+ break; |
} |
pat_len = strlen(q); |
@@ -511,7 +512,7 @@ |
int use_y4m = 1; |
int opt_yv12 = 0; |
int opt_i420 = 0; |
- vpx_codec_dec_cfg_t cfg = {0}; |
+ vpx_codec_dec_cfg_t cfg = {0, 0, 0}; |
#if CONFIG_VP8_DECODER |
vp8_postproc_cfg_t vp8_pp_cfg = {0}; |
int vp8_dbg_color_ref_frame = 0; |
@@ -525,7 +526,7 @@ |
vpx_image_t *scaled_img = NULL; |
int frame_avail, got_data; |
int num_external_frame_buffers = 0; |
- struct ExternalFrameBufferList ext_fb_list = {0}; |
+ struct ExternalFrameBufferList ext_fb_list = {0, NULL}; |
const char *outfile_pattern = NULL; |
char outfile_name[PATH_MAX] = {0}; |
@@ -534,8 +535,8 @@ |
MD5Context md5_ctx; |
unsigned char md5_digest[16]; |
- struct VpxDecInputContext input = {0}; |
- struct VpxInputContext vpx_input_ctx = {0}; |
+ struct VpxDecInputContext input = {NULL, NULL}; |
+ struct VpxInputContext vpx_input_ctx; |
#if CONFIG_WEBM_IO |
struct WebmInputContext webm_ctx = {0}; |
input.webm_ctx = &webm_ctx; |