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

vpxdec.c

diff --git a/vpxdec.c b/vpxdec.c
index 6c1ce11..d8157d0 100644
--- a/vpxdec.c
+++ b/vpxdec.c
@@ -482,6 +482,7 @@
 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;