diff options
| author | James Zern <jzern@google.com> | 2015-05-16 10:33:57 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-05-16 10:33:57 -0700 |
| commit | 85076fc5ab9cfce05d9c3f40e78932383655415d (patch) | |
| tree | b4041266f029eaf37e9617e15dd86d7d67db6e02 /vp9/decoder | |
| parent | cdf16c22baea1ead5900bcdbd4d44b8c2ce80728 (diff) | |
| download | libvpx-85076fc5ab9cfce05d9c3f40e78932383655415d.tar libvpx-85076fc5ab9cfce05d9c3f40e78932383655415d.tar.gz libvpx-85076fc5ab9cfce05d9c3f40e78932383655415d.tar.bz2 libvpx-85076fc5ab9cfce05d9c3f40e78932383655415d.zip | |
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
Diffstat (limited to 'vp9/decoder')
| -rw-r--r-- | vp9/decoder/vp9_decodeframe.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/vp9/decoder/vp9_decodeframe.c b/vp9/decoder/vp9_decodeframe.c index 7415a1b78..fcf480b86 100644 --- a/vp9/decoder/vp9_decodeframe.c +++ b/vp9/decoder/vp9_decodeframe.c @@ -1985,15 +1985,16 @@ static void dec_build_inter_predictors(VP9Decoder *const pbi, MACROBLOCKD *xd, const int b_h = y1 - y0 + 1; 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, - frame_width, frame_height, border_offset, - dst, dst_buf->stride, - subpel_x, subpel_y, - kernel, sf, + extend_and_predict(buf_ptr1, buf_stride, x0, y0, b_w, b_h, + frame_width, frame_height, border_offset, + dst, dst_buf->stride, + subpel_x, subpel_y, + kernel, sf, #if CONFIG_VP9_HIGHBITDEPTH - xd, + xd, #endif - w, h, ref, xs, ys); + w, h, ref, xs, ys); + return; } } else { // Wait until reference block is ready. Pad 7 more pixels as last 7 |