From: Alex Converse <aconverse@google.com>
Date: Fri, 14 Feb 2014 01:02:50 +0000 (-0800)
Subject: Fix build error caused by a merge conflict.
X-Git-Tag: v1.4.0~2373^2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=2eccbd0f4bb060c5ac3369c83bd0f02e39ad97c2;p=libvpx

Fix build error caused by a merge conflict.

Commit 70d9664f removed 'int i' required by a4f30a50.

Change-Id: I4e7e14e9e8532f753e43a57b5bba4589d58e0c32
---

diff --git a/vpxdec.c b/vpxdec.c
index 6c1ce11dc..d8157d005 100644
--- 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;