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

2014-02-13 19:03:13 -08:00 · 2014-02-13 19:03:13 -08:00 · 5dbdff0f60
commit 5dbdff0f60
parent bdd8966439 2eccbd0f4b
1 changed files with 1 additions and 0 deletions
--- 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;