| Index: source/libvpx/vp8/common/x86/loopfilter_x86.h | 
| =================================================================== | 
| --- source/libvpx/vp8/common/x86/loopfilter_x86.h	(revision 96967) | 
| +++ source/libvpx/vp8/common/x86/loopfilter_x86.h	(working copy) | 
| @@ -24,10 +24,10 @@ | 
| extern prototype_loopfilter_block(vp8_loop_filter_bv_mmx); | 
| extern prototype_loopfilter_block(vp8_loop_filter_mbh_mmx); | 
| extern prototype_loopfilter_block(vp8_loop_filter_bh_mmx); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbvs_mmx); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bvs_mmx); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbhs_mmx); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bhs_mmx); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_simple_vertical_edge_mmx); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bvs_mmx); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_simple_horizontal_edge_mmx); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bhs_mmx); | 
|  | 
|  | 
| #if !CONFIG_RUNTIME_CPU_DETECT | 
| @@ -44,13 +44,13 @@ | 
| #define vp8_lf_normal_b_h vp8_loop_filter_bh_mmx | 
|  | 
| #undef  vp8_lf_simple_mb_v | 
| -#define vp8_lf_simple_mb_v vp8_loop_filter_mbvs_mmx | 
| +#define vp8_lf_simple_mb_v vp8_loop_filter_simple_vertical_edge_mmx | 
|  | 
| #undef  vp8_lf_simple_b_v | 
| #define vp8_lf_simple_b_v vp8_loop_filter_bvs_mmx | 
|  | 
| #undef  vp8_lf_simple_mb_h | 
| -#define vp8_lf_simple_mb_h vp8_loop_filter_mbhs_mmx | 
| +#define vp8_lf_simple_mb_h vp8_loop_filter_simple_horizontal_edge_mmx | 
|  | 
| #undef  vp8_lf_simple_b_h | 
| #define vp8_lf_simple_b_h vp8_loop_filter_bhs_mmx | 
| @@ -63,10 +63,10 @@ | 
| extern prototype_loopfilter_block(vp8_loop_filter_bv_sse2); | 
| extern prototype_loopfilter_block(vp8_loop_filter_mbh_sse2); | 
| extern prototype_loopfilter_block(vp8_loop_filter_bh_sse2); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbvs_sse2); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bvs_sse2); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_mbhs_sse2); | 
| -extern prototype_loopfilter_block(vp8_loop_filter_bhs_sse2); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_simple_vertical_edge_sse2); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bvs_sse2); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_simple_horizontal_edge_sse2); | 
| +extern prototype_simple_loopfilter(vp8_loop_filter_bhs_sse2); | 
|  | 
|  | 
| #if !CONFIG_RUNTIME_CPU_DETECT | 
| @@ -83,13 +83,13 @@ | 
| #define vp8_lf_normal_b_h vp8_loop_filter_bh_sse2 | 
|  | 
| #undef  vp8_lf_simple_mb_v | 
| -#define vp8_lf_simple_mb_v vp8_loop_filter_mbvs_sse2 | 
| +#define vp8_lf_simple_mb_v vp8_loop_filter_simple_vertical_edge_sse2 | 
|  | 
| #undef  vp8_lf_simple_b_v | 
| #define vp8_lf_simple_b_v vp8_loop_filter_bvs_sse2 | 
|  | 
| #undef  vp8_lf_simple_mb_h | 
| -#define vp8_lf_simple_mb_h vp8_loop_filter_mbhs_sse2 | 
| +#define vp8_lf_simple_mb_h vp8_loop_filter_simple_horizontal_edge_sse2 | 
|  | 
| #undef  vp8_lf_simple_b_h | 
| #define vp8_lf_simple_b_h vp8_loop_filter_bhs_sse2 | 
|  |