Merge "Fix build error caused by a merge conflict."

5dbdff0f · Yaowu Xu · Gerrit Code Review · bdd89664 · 2eccbd0f · 5dbdff0f
Commit 5dbdff0f authored Feb 13, 2014 by Yaowu Xu Committed by Gerrit Code Review Feb 13, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 1 addition and 0 deletions

vpxdec.c vpxdec.c +1 -0

No files found.
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -482,6 +482,7 @@ static FILE *open_outfile(const char *name) {
 int main_loop(int argc, const char **argv_) {
  vpx_codec_ctx_t       decoder;
  char                  *fn = NULL;
+  int                    i;
  uint8_t               *buf = NULL;
  size_t                 bytes_in_buffer = 0, buffer_size = 0;
  FILE                  *infile;