]> granicus.if.org Git - libvpx/commitdiff
Fix build error caused by a merge conflict.
authorAlex Converse <aconverse@google.com>
Fri, 14 Feb 2014 01:02:50 +0000 (17:02 -0800)
committerAlex Converse <aconverse@google.com>
Fri, 14 Feb 2014 01:05:13 +0000 (17:05 -0800)
Commit 70d9664f removed 'int i' required by a4f30a50.

Change-Id: I4e7e14e9e8532f753e43a57b5bba4589d58e0c32

vpxdec.c

index 6c1ce11dcd7319c89d5dcf2551f7fb60092960cb..d8157d005a8dc8efcc68f3017bb98dbdafe4669a 100644 (file)
--- 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;