diff options
| author | Johann <johannkoenig@google.com> | 2016-06-10 18:09:04 -0700 |
|---|---|---|
| committer | Johann Koenig <johannkoenig@google.com> | 2016-06-16 20:58:37 +0000 |
| commit | db81c3433629d1bb6488966bededb5f80b83369f (patch) | |
| tree | e24cd77dab2daa7d6bd76eda50c53848d9833846 /vp8/encoder/onyx_if.c | |
| parent | 87679994936b0755312f5ef4bae30afb2da22371 (diff) | |
| download | libvpx-db81c3433629d1bb6488966bededb5f80b83369f.tar libvpx-db81c3433629d1bb6488966bededb5f80b83369f.tar.gz libvpx-db81c3433629d1bb6488966bededb5f80b83369f.tar.bz2 libvpx-db81c3433629d1bb6488966bededb5f80b83369f.zip | |
vp8_change_config: fix unsigned/signed comparison
Use ~15 instead of 0x..F0
Cleans warning in Android build:
comparison of integers of different signs: 'unsigned int' and 'int'
if (((cm->Width + 15) & 0xfffffff0) !=
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
comparison of integers of different signs: 'unsigned int' and 'int'
((cm->Height + 15) & 0xfffffff0) !=
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ ^
Change-Id: Iac25839cde3425b7b9db7f33740dc46a551b7546
Diffstat (limited to 'vp8/encoder/onyx_if.c')
| -rw-r--r-- | vp8/encoder/onyx_if.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/vp8/encoder/onyx_if.c b/vp8/encoder/onyx_if.c index 66c3f4267..1a309938c 100644 --- a/vp8/encoder/onyx_if.c +++ b/vp8/encoder/onyx_if.c @@ -1787,10 +1787,8 @@ void vp8_change_config(VP8_COMP *cpi, VP8_CONFIG *oxcf) if (last_w != cpi->oxcf.Width || last_h != cpi->oxcf.Height) cpi->force_next_frame_intra = 1; - if (((cm->Width + 15) & 0xfffffff0) != - cm->yv12_fb[cm->lst_fb_idx].y_width || - ((cm->Height + 15) & 0xfffffff0) != - cm->yv12_fb[cm->lst_fb_idx].y_height || + if (((cm->Width + 15) & ~15) != cm->yv12_fb[cm->lst_fb_idx].y_width || + ((cm->Height + 15) & ~15) != cm->yv12_fb[cm->lst_fb_idx].y_height || cm->yv12_fb[cm->lst_fb_idx].y_width == 0) { dealloc_raw_frame_buffers(cpi); |