ref: 2eccbd0f4bb060c5ac3369c83bd0f02e39ad97c2
parent: 27f809db914dfb2e4bc108134a8ccd46a0ce8bd0
author: Alex Converse <[email protected]>
date: Thu Feb 13 12:02:50 EST 2014
Fix build error caused by a merge conflict. Commit 70d9664f removed 'int i' required by a4f30a50. Change-Id: I4e7e14e9e8532f753e43a57b5bba4589d58e0c32
--- 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;