diff options
| author | Johann Koenig <johannkoenig@google.com> | 2016-06-16 21:53:29 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-06-16 21:53:29 +0000 |
| commit | 73ae3cdeefef682d97f435f19830fb6fedccb17e (patch) | |
| tree | 8b76ddded8dd920761792c481d4bf8a05900b92e /vp8/encoder/onyx_if.c | |
| parent | de3a8f23c8c10f9fb4f4430cca68d34ee316961d (diff) | |
| parent | db81c3433629d1bb6488966bededb5f80b83369f (diff) | |
| download | libvpx-73ae3cdeefef682d97f435f19830fb6fedccb17e.tar libvpx-73ae3cdeefef682d97f435f19830fb6fedccb17e.tar.gz libvpx-73ae3cdeefef682d97f435f19830fb6fedccb17e.tar.bz2 libvpx-73ae3cdeefef682d97f435f19830fb6fedccb17e.zip | |
Merge "vp8_change_config: fix unsigned/signed comparison"
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 581db62b4..d5a0fff35 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); |