Merge branch 'master' into nextgenv2

Change-Id: Ia3c0f2103fd997613d9f16156795028f89f63265
2016-07-14 10:57:35 -07:00
parent 0c68db43ea 243029faff
commit 6fe07a207b
178 changed files with 6700 additions and 6498 deletions
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -268,8 +268,7 @@ static int read_frame(struct VpxDecInputContext *input, uint8_t **buf,
  switch (input->vpx_input_ctx->file_type) {
 #if CONFIG_WEBM_IO
    case FILE_TYPE_WEBM:
-      return webm_read_frame(input->webm_ctx,
-                             buf, bytes_in_buffer, buffer_size);
+      return webm_read_frame(input->webm_ctx, buf, bytes_in_buffer);
 #endif
    case FILE_TYPE_RAW:
      return raw_read_frame(input->vpx_input_ctx->file,