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

Merge "MSVS compiler error" into experimental

Browse Source
This commit is contained in:
Paul Wilkins
2013-01-24 09:21:49 -08:00
committed by Gerrit Code Review
parent 70019f6070 f75976253e
commit 425316bcef
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
vpxenc.c
View File

@@ -1449,10 +1449,10 @@ static void show_rate_histogram(struct rate_hist *hist,
#define mmin(a, b) ((a) < (b) ? (a) : (b)) #define mmin(a, b) ((a) < (b) ? (a) : (b))
static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2, static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
int yloc[2], int uloc[2], int vloc[2]) { int yloc[2], int uloc[2], int vloc[2]) {
static const int bsize = 64; const unsigned int bsize = 64;
static const int bsize2 = bsize >> 1; const unsigned int bsize2 = bsize >> 1;
int match = 1; unsigned int match = 1;
int i, j; unsigned int i, j;
yloc[0] = yloc[1] = -1; yloc[0] = yloc[1] = -1;
for (i = 0, match = 1; match && i < img1->d_h; i += bsize) { for (i = 0, match = 1; match && i < img1->d_h; i += bsize) {
for (j = 0; match && j < img1->d_w; j += bsize) { for (j = 0; match && j < img1->d_w; j += bsize) {
@@ -1518,7 +1518,7 @@ static void find_mismatch(vpx_image_t *img1, vpx_image_t *img2,
static int compare_img(vpx_image_t *img1, vpx_image_t *img2) static int compare_img(vpx_image_t *img1, vpx_image_t *img2)
{ {
int match = 1; int match = 1;
int i; unsigned int i;
match &= (img1->fmt == img2->fmt); match &= (img1->fmt == img2->fmt);
match &= (img1->w == img2->w); match &= (img1->w == img2->w);