generic-library/vpx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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

Browse Source
This commit is contained in:
Yaowu Xu 2014-02-13 19:03:13 -08:00 committed by Gerrit Code Review
commit 5dbdff0f60
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
vpxdec.c
View File

@ -482,6 +482,7 @@ static FILE *open_outfile(const char *name) {
int main_loop(int argc, const char **argv_) { int main_loop(int argc, const char **argv_) {
vpx_codec_ctx_t decoder; vpx_codec_ctx_t decoder;
char *fn = NULL; char *fn = NULL;
int i;
uint8_t *buf = NULL; uint8_t *buf = NULL;
size_t bytes_in_buffer = 0, buffer_size = 0; size_t bytes_in_buffer = 0, buffer_size = 0;
FILE *infile; FILE *infile;