Merge "vp8_change_config: fix unsigned/signed comparison"

This commit is contained in:
Johann Koenig 2016-06-16 21:53:29 +00:00 committed by Gerrit Code Review
commit 73ae3cdeef

View File

@ -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) if (last_w != cpi->oxcf.Width || last_h != cpi->oxcf.Height)
cpi->force_next_frame_intra = 1; cpi->force_next_frame_intra = 1;
if (((cm->Width + 15) & 0xfffffff0) != if (((cm->Width + 15) & ~15) != cm->yv12_fb[cm->lst_fb_idx].y_width ||
cm->yv12_fb[cm->lst_fb_idx].y_width || ((cm->Height + 15) & ~15) != cm->yv12_fb[cm->lst_fb_idx].y_height ||
((cm->Height + 15) & 0xfffffff0) !=
cm->yv12_fb[cm->lst_fb_idx].y_height ||
cm->yv12_fb[cm->lst_fb_idx].y_width == 0) cm->yv12_fb[cm->lst_fb_idx].y_width == 0)
{ {
dealloc_raw_frame_buffers(cpi); dealloc_raw_frame_buffers(cpi);