dec_build_inter_predictors: don't return a void fn
split call of extend_and_predict() and return, fixes visual studio build
warning since:
0a80164
Move mc_buf to cut down size of MACROBLOCKD.
Change-Id: I7cdf712941ef773a07f038539cb8080dc27861cd
This commit is contained in:
Родитель
cdf16c22ba
Коммит
85076fc5ab
|
@ -1985,15 +1985,16 @@ static void dec_build_inter_predictors(VP9Decoder *const pbi, MACROBLOCKD *xd,
|
||||||
const int b_h = y1 - y0 + 1;
|
const int b_h = y1 - y0 + 1;
|
||||||
const int border_offset = y_pad * 3 * b_w + x_pad * 3;
|
const int border_offset = y_pad * 3 * b_w + x_pad * 3;
|
||||||
|
|
||||||
return extend_and_predict(buf_ptr1, buf_stride, x0, y0, b_w, b_h,
|
extend_and_predict(buf_ptr1, buf_stride, x0, y0, b_w, b_h,
|
||||||
frame_width, frame_height, border_offset,
|
frame_width, frame_height, border_offset,
|
||||||
dst, dst_buf->stride,
|
dst, dst_buf->stride,
|
||||||
subpel_x, subpel_y,
|
subpel_x, subpel_y,
|
||||||
kernel, sf,
|
kernel, sf,
|
||||||
#if CONFIG_VP9_HIGHBITDEPTH
|
#if CONFIG_VP9_HIGHBITDEPTH
|
||||||
xd,
|
xd,
|
||||||
#endif
|
#endif
|
||||||
w, h, ref, xs, ys);
|
w, h, ref, xs, ys);
|
||||||
|
return;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
// Wait until reference block is ready. Pad 7 more pixels as last 7
|
// Wait until reference block is ready. Pad 7 more pixels as last 7
|
||||||
|
|
Загрузка…
Ссылка в новой задаче