Commit 2c5dc477 authored by Jim Bankoski's avatar Jim Bankoski Committed by Gerrit Code Review
Browse files

Merge "remove vp8 unused uvstride parm in simple loop filter"

parents 3d94b9bf 392a2c43
...@@ -254,7 +254,7 @@ void vp8_loop_filter_row_normal(VP8_COMMON *cm, MODE_INFO *mode_info_context, ...@@ -254,7 +254,7 @@ void vp8_loop_filter_row_normal(VP8_COMMON *cm, MODE_INFO *mode_info_context,
} }
void vp8_loop_filter_row_simple(VP8_COMMON *cm, MODE_INFO *mode_info_context, void vp8_loop_filter_row_simple(VP8_COMMON *cm, MODE_INFO *mode_info_context,
int mb_row, int post_ystride, int post_uvstride, int mb_row, int post_ystride,
unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr) unsigned char *v_ptr)
{ {
......
...@@ -103,7 +103,7 @@ void vp8_loop_filter_row_normal(struct VP8Common *cm, ...@@ -103,7 +103,7 @@ void vp8_loop_filter_row_normal(struct VP8Common *cm,
void vp8_loop_filter_row_simple(struct VP8Common *cm, void vp8_loop_filter_row_simple(struct VP8Common *cm,
struct modeinfo *mode_info_context, struct modeinfo *mode_info_context,
int mb_row, int post_ystride, int post_uvstride, int mb_row, int post_ystride,
unsigned char *y_ptr, unsigned char *u_ptr, unsigned char *y_ptr, unsigned char *u_ptr,
unsigned char *v_ptr); unsigned char *v_ptr);
#ifdef __cplusplus #ifdef __cplusplus
......
...@@ -689,7 +689,7 @@ static void decode_mb_rows(VP8D_COMP *pbi) ...@@ -689,7 +689,7 @@ static void decode_mb_rows(VP8D_COMP *pbi)
lf_dst[0], lf_dst[1], lf_dst[2]); lf_dst[0], lf_dst[1], lf_dst[2]);
else else
vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1, vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1,
recon_y_stride, recon_uv_stride, recon_y_stride,
lf_dst[0], lf_dst[1], lf_dst[2]); lf_dst[0], lf_dst[1], lf_dst[2]);
if(mb_row > 1) if(mb_row > 1)
{ {
...@@ -734,8 +734,7 @@ static void decode_mb_rows(VP8D_COMP *pbi) ...@@ -734,8 +734,7 @@ static void decode_mb_rows(VP8D_COMP *pbi)
lf_dst[2]); lf_dst[2]);
else else
vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1, recon_y_stride, vp8_loop_filter_row_simple(pc, lf_mic, mb_row-1, recon_y_stride,
recon_uv_stride, lf_dst[0], lf_dst[1], lf_dst[0], lf_dst[1], lf_dst[2]);
lf_dst[2]);
yv12_extend_frame_left_right_c(yv12_fb_new, yv12_extend_frame_left_right_c(yv12_fb_new,
eb_dst[0], eb_dst[0],
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment