ref: 73ae3cdeefef682d97f435f19830fb6fedccb17e
parent: de3a8f23c8c10f9fb4f4430cca68d34ee316961d
parent: db81c3433629d1bb6488966bededb5f80b83369f
author: Johann Koenig <[email protected]>
date: Thu Jun 16 17:53:29 EDT 2016
Merge "vp8_change_config: fix unsigned/signed comparison"
--- a/vp8/encoder/onyx_if.c
+++ b/vp8/encoder/onyx_if.c
@@ -1787,10 +1787,8 @@
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);