diff options
| author | John Koleszar <jkoleszar@google.com> | 2012-11-06 12:08:05 -0800 |
|---|---|---|
| committer | John Koleszar <jkoleszar@google.com> | 2012-11-06 12:08:05 -0800 |
| commit | 82b1a3433df1705e73d83eaeb9731f67c29c8883 (patch) | |
| tree | 303d1da53cf26885d1f27a60b775b88a258c5c9a /y4minput.c | |
| parent | 6ad3b74a58779a839b15c8619693c7a433fcac2a (diff) | |
| download | libvpx-82b1a3433df1705e73d83eaeb9731f67c29c8883.tar libvpx-82b1a3433df1705e73d83eaeb9731f67c29c8883.tar.gz libvpx-82b1a3433df1705e73d83eaeb9731f67c29c8883.tar.bz2 libvpx-82b1a3433df1705e73d83eaeb9731f67c29c8883.zip | |
Merge other top-level C code
Change-Id: I0ff77f51595599cc3de5183c6c655fd261e3d925
Diffstat (limited to 'y4minput.c')
| -rw-r--r-- | y4minput.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/y4minput.c b/y4minput.c index 6be5b2bad..24f0c154f 100644 --- a/y4minput.c +++ b/y4minput.c @@ -669,7 +669,7 @@ int y4m_input_open(y4m_input *_y4m, FILE *_fin, char *_skip, int _nskip) { buffer[i] = *_skip++; _nskip--; } else { - ret = fread(buffer + i, 1, 1, _fin); + ret = (int)fread(buffer + i, 1, 1, _fin); if (ret < 1)return -1; } if (buffer[i] == '\n')break; @@ -815,7 +815,7 @@ int y4m_input_fetch_frame(y4m_input *_y4m, FILE *_fin, vpx_image_t *_img) { int c_sz; int ret; /*Read and skip the frame header.*/ - ret = fread(frame, 1, 6, _fin); + ret = (int)fread(frame, 1, 6, _fin); if (ret < 6)return 0; if (memcmp(frame, "FRAME", 5)) { fprintf(stderr, "Loss of framing in Y4M input data\n"); |