Bug 1331498: Update libvpx to v1.6.1. r=rillian
authorJohann <johannkoenig@google.com>
Tue, 17 Jan 2017 13:46:42 -0800
changeset 377112 58764883978d7959d480b9d2722c16f40f63bf96
parent 377111 44b7d75e21e8cf9c9d9f5ea44f07a213fcc08e56
child 377113 ad4e531c7070874770201b5af956f3f8045c973b
push id1419
push userjlund@mozilla.com
push dateMon, 10 Apr 2017 20:44:07 +0000
treeherdermozilla-release@5e6801b73ef6 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersrillian
bugs1331498
milestone53.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1331498: Update libvpx to v1.6.1. r=rillian Removes armv6 and mmx optimizations. Removes x86inc.asm distinction. This was put in place because of issues with 32bit PIC builds but x86inc.asm has since been improved to support those. Switch to '.S' for arm assembly. There is now an #include for a helper file. All build systems appear to support .S so switch to it for consistency. Remove clang-cl.patch. There have been numerous changes upstream to improve clang support. MozReview-Commit-ID: IHVTbqSY2U7
media/libvpx/Makefile.in
media/libvpx/README_MOZILLA
media/libvpx/bug1137614.patch
media/libvpx/clang-cl.patch
media/libvpx/config/generic/vp8_rtcd.h
media/libvpx/config/generic/vp9_rtcd.h
media/libvpx/config/generic/vpx_config.asm
media/libvpx/config/generic/vpx_config.h
media/libvpx/config/generic/vpx_dsp_rtcd.h
media/libvpx/config/linux/arm/vp8_rtcd.h
media/libvpx/config/linux/arm/vp9_rtcd.h
media/libvpx/config/linux/arm/vpx_config.asm
media/libvpx/config/linux/arm/vpx_config.h
media/libvpx/config/linux/arm/vpx_dsp_rtcd.h
media/libvpx/config/linux/ia32/vp8_rtcd.h
media/libvpx/config/linux/ia32/vp9_rtcd.h
media/libvpx/config/linux/ia32/vpx_config.asm
media/libvpx/config/linux/ia32/vpx_config.c
media/libvpx/config/linux/ia32/vpx_config.h
media/libvpx/config/linux/ia32/vpx_dsp_rtcd.h
media/libvpx/config/linux/x64/vp8_rtcd.h
media/libvpx/config/linux/x64/vp9_rtcd.h
media/libvpx/config/linux/x64/vpx_config.asm
media/libvpx/config/linux/x64/vpx_config.h
media/libvpx/config/linux/x64/vpx_dsp_rtcd.h
media/libvpx/config/mac/ia32/vp8_rtcd.h
media/libvpx/config/mac/ia32/vp9_rtcd.h
media/libvpx/config/mac/ia32/vpx_config.asm
media/libvpx/config/mac/ia32/vpx_config.c
media/libvpx/config/mac/ia32/vpx_config.h
media/libvpx/config/mac/ia32/vpx_dsp_rtcd.h
media/libvpx/config/mac/x64/vp8_rtcd.h
media/libvpx/config/mac/x64/vp9_rtcd.h
media/libvpx/config/mac/x64/vpx_config.asm
media/libvpx/config/mac/x64/vpx_config.h
media/libvpx/config/mac/x64/vpx_dsp_rtcd.h
media/libvpx/config/vpx_version.h
media/libvpx/config/win/ia32/vp8_rtcd.h
media/libvpx/config/win/ia32/vp9_rtcd.h
media/libvpx/config/win/ia32/vpx_config.asm
media/libvpx/config/win/ia32/vpx_config.c
media/libvpx/config/win/ia32/vpx_config.h
media/libvpx/config/win/ia32/vpx_dsp_rtcd.h
media/libvpx/config/win/x64/vp8_rtcd.h
media/libvpx/config/win/x64/vp9_rtcd.h
media/libvpx/config/win/x64/vpx_config.asm
media/libvpx/config/win/x64/vpx_config.h
media/libvpx/config/win/x64/vpx_dsp_rtcd.h
media/libvpx/generate_sources_mozbuild.sh
media/libvpx/input_frame_validation.patch
media/libvpx/input_frame_validation_vp9.patch
media/libvpx/libvpx/.clang-format
media/libvpx/libvpx/AUTHORS
media/libvpx/libvpx/CHANGELOG
media/libvpx/libvpx/README
media/libvpx/libvpx/args.c
media/libvpx/libvpx/args.h
media/libvpx/libvpx/build/make/Android.mk
media/libvpx/libvpx/build/make/Makefile
media/libvpx/libvpx/build/make/ads2gas.pl
media/libvpx/libvpx/build/make/ads2gas_apple.pl
media/libvpx/libvpx/build/make/configure.sh
media/libvpx/libvpx/build/make/gen_msvs_proj.sh
media/libvpx/libvpx/build/make/gen_msvs_sln.sh
media/libvpx/libvpx/build/make/gen_msvs_vcxproj.sh
media/libvpx/libvpx/build/make/rtcd.pl
media/libvpx/libvpx/codereview.settings
media/libvpx/libvpx/configure
media/libvpx/libvpx/examples.mk
media/libvpx/libvpx/examples/decode_to_md5.c
media/libvpx/libvpx/examples/decode_with_drops.c
media/libvpx/libvpx/examples/postproc.c
media/libvpx/libvpx/examples/resize_util.c
media/libvpx/libvpx/examples/set_maps.c
media/libvpx/libvpx/examples/simple_decoder.c
media/libvpx/libvpx/examples/simple_encoder.c
media/libvpx/libvpx/examples/twopass_encoder.c
media/libvpx/libvpx/examples/vp8_multi_resolution_encoder.c
media/libvpx/libvpx/examples/vp8cx_set_ref.c
media/libvpx/libvpx/examples/vp9_lossless_encoder.c
media/libvpx/libvpx/examples/vp9_spatial_svc_encoder.c
media/libvpx/libvpx/examples/vp9cx_set_ref.c
media/libvpx/libvpx/examples/vpx_temporal_svc_encoder.c
media/libvpx/libvpx/ivfdec.c
media/libvpx/libvpx/ivfdec.h
media/libvpx/libvpx/ivfenc.c
media/libvpx/libvpx/ivfenc.h
media/libvpx/libvpx/libs.mk
media/libvpx/libvpx/md5_utils.c
media/libvpx/libvpx/rate_hist.c
media/libvpx/libvpx/test/acm_random.h
media/libvpx/libvpx/test/active_map_refresh_test.cc
media/libvpx/libvpx/test/active_map_test.cc
media/libvpx/libvpx/test/add_noise_test.cc
media/libvpx/libvpx/test/alt_ref_aq_segment_test.cc
media/libvpx/libvpx/test/altref_test.cc
media/libvpx/libvpx/test/aq_segment_test.cc
media/libvpx/libvpx/test/avg_test.cc
media/libvpx/libvpx/test/blockiness_test.cc
media/libvpx/libvpx/test/borders_test.cc
media/libvpx/libvpx/test/byte_alignment_test.cc
media/libvpx/libvpx/test/clear_system_state.h
media/libvpx/libvpx/test/codec_factory.h
media/libvpx/libvpx/test/config_test.cc
media/libvpx/libvpx/test/consistency_test.cc
media/libvpx/libvpx/test/convolve_test.cc
media/libvpx/libvpx/test/cpu_speed_test.cc
media/libvpx/libvpx/test/cq_test.cc
media/libvpx/libvpx/test/cx_set_ref.sh
media/libvpx/libvpx/test/datarate_test.cc
media/libvpx/libvpx/test/dct16x16_test.cc
media/libvpx/libvpx/test/dct32x32_test.cc
media/libvpx/libvpx/test/decode_api_test.cc
media/libvpx/libvpx/test/decode_perf_test.cc
media/libvpx/libvpx/test/decode_svc_test.cc
media/libvpx/libvpx/test/decode_test_driver.cc
media/libvpx/libvpx/test/decode_test_driver.h
media/libvpx/libvpx/test/encode_api_test.cc
media/libvpx/libvpx/test/encode_perf_test.cc
media/libvpx/libvpx/test/encode_test_driver.cc
media/libvpx/libvpx/test/encode_test_driver.h
media/libvpx/libvpx/test/error_resilience_test.cc
media/libvpx/libvpx/test/examples.sh
media/libvpx/libvpx/test/external_frame_buffer_test.cc
media/libvpx/libvpx/test/fdct4x4_test.cc
media/libvpx/libvpx/test/fdct8x8_test.cc
media/libvpx/libvpx/test/frame_size_tests.cc
media/libvpx/libvpx/test/hadamard_test.cc
media/libvpx/libvpx/test/i420_video_source.h
media/libvpx/libvpx/test/idct8x8_test.cc
media/libvpx/libvpx/test/idct_test.cc
media/libvpx/libvpx/test/invalid_file_test.cc
media/libvpx/libvpx/test/ivf_video_source.h
media/libvpx/libvpx/test/keyframe_test.cc
media/libvpx/libvpx/test/level_test.cc
media/libvpx/libvpx/test/lpf_8_test.cc
media/libvpx/libvpx/test/lpf_test.cc
media/libvpx/libvpx/test/md5_helper.h
media/libvpx/libvpx/test/minmax_test.cc
media/libvpx/libvpx/test/partial_idct_test.cc
media/libvpx/libvpx/test/pp_filter_test.cc
media/libvpx/libvpx/test/predict_test.cc
media/libvpx/libvpx/test/realtime_test.cc
media/libvpx/libvpx/test/register_state_check.h
media/libvpx/libvpx/test/resize_test.cc
media/libvpx/libvpx/test/sad_test.cc
media/libvpx/libvpx/test/set_roi.cc
media/libvpx/libvpx/test/sixtap_predict_test.cc
media/libvpx/libvpx/test/stress.sh
media/libvpx/libvpx/test/sum_squares_test.cc
media/libvpx/libvpx/test/superframe_test.cc
media/libvpx/libvpx/test/svc_test.cc
media/libvpx/libvpx/test/test-data.mk
media/libvpx/libvpx/test/test-data.sha1
media/libvpx/libvpx/test/test.mk
media/libvpx/libvpx/test/test_intra_pred_speed.cc
media/libvpx/libvpx/test/test_libvpx.cc
media/libvpx/libvpx/test/test_vector_test.cc
media/libvpx/libvpx/test/test_vectors.cc
media/libvpx/libvpx/test/test_vectors.h
media/libvpx/libvpx/test/tile_independence_test.cc
media/libvpx/libvpx/test/user_priv_test.cc
media/libvpx/libvpx/test/util.h
media/libvpx/libvpx/test/variance_test.cc
media/libvpx/libvpx/test/video_source.h
media/libvpx/libvpx/test/vp8_boolcoder_test.cc
media/libvpx/libvpx/test/vp8_decrypt_test.cc
media/libvpx/libvpx/test/vp8_denoiser_sse2_test.cc
media/libvpx/libvpx/test/vp8_fdct4x4_test.cc
media/libvpx/libvpx/test/vp8_fragments_test.cc
media/libvpx/libvpx/test/vp8cx_set_ref.sh
media/libvpx/libvpx/test/vp9_arf_freq_test.cc
media/libvpx/libvpx/test/vp9_boolcoder_test.cc
media/libvpx/libvpx/test/vp9_decrypt_test.cc
media/libvpx/libvpx/test/vp9_denoiser_sse2_test.cc
media/libvpx/libvpx/test/vp9_encoder_parms_get_to_decoder.cc
media/libvpx/libvpx/test/vp9_end_to_end_test.cc
media/libvpx/libvpx/test/vp9_error_block_test.cc
media/libvpx/libvpx/test/vp9_ethread_test.cc
media/libvpx/libvpx/test/vp9_frame_parallel_test.cc
media/libvpx/libvpx/test/vp9_intrapred_test.cc
media/libvpx/libvpx/test/vp9_lossless_test.cc
media/libvpx/libvpx/test/vp9_quantize_test.cc
media/libvpx/libvpx/test/vp9_skip_loopfilter_test.cc
media/libvpx/libvpx/test/vp9_subtract_test.cc
media/libvpx/libvpx/test/vp9_thread_test.cc
media/libvpx/libvpx/test/vpx_scale_test.cc
media/libvpx/libvpx/test/vpx_temporal_svc_encoder.sh
media/libvpx/libvpx/test/webm_video_source.h
media/libvpx/libvpx/test/y4m_test.cc
media/libvpx/libvpx/test/y4m_video_source.h
media/libvpx/libvpx/test/yuv_video_source.h
media/libvpx/libvpx/third_party/googletest/README.libvpx
media/libvpx/libvpx/third_party/googletest/src/src/gtest-all.cc
media/libvpx/libvpx/third_party/libwebm/README.libvpx
media/libvpx/libvpx/third_party/libwebm/common/file_util.cc
media/libvpx/libvpx/third_party/libwebm/common/hdr_util.cc
media/libvpx/libvpx/third_party/libwebm/common/hdr_util.h
media/libvpx/libvpx/third_party/libwebm/common/webmids.h
media/libvpx/libvpx/third_party/libwebm/mkvmuxer/mkvmuxer.cc
media/libvpx/libvpx/third_party/libwebm/mkvmuxer/mkvmuxer.h
media/libvpx/libvpx/third_party/libwebm/mkvmuxer/mkvmuxerutil.cc
media/libvpx/libvpx/third_party/libwebm/mkvmuxer/mkvmuxerutil.h
media/libvpx/libvpx/third_party/libwebm/mkvmuxer/mkvwriter.cc
media/libvpx/libvpx/third_party/libwebm/mkvparser/mkvparser.cc
media/libvpx/libvpx/third_party/libwebm/mkvparser/mkvparser.h
media/libvpx/libvpx/third_party/libwebm/mkvparser/mkvreader.cc
media/libvpx/libvpx/third_party/libyuv/README.libvpx
media/libvpx/libvpx/third_party/libyuv/include/libyuv/basic_types.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/convert.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/convert_argb.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/convert_from.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/cpu_id.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/planar_functions.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/rotate_row.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/row.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/scale_argb.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/scale_row.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/version.h
media/libvpx/libvpx/third_party/libyuv/include/libyuv/video_common.h
media/libvpx/libvpx/third_party/libyuv/source/compare.cc
media/libvpx/libvpx/third_party/libyuv/source/compare_common.cc
media/libvpx/libvpx/third_party/libyuv/source/compare_gcc.cc
media/libvpx/libvpx/third_party/libyuv/source/compare_neon.cc
media/libvpx/libvpx/third_party/libyuv/source/compare_neon64.cc
media/libvpx/libvpx/third_party/libyuv/source/compare_win.cc
media/libvpx/libvpx/third_party/libyuv/source/convert.cc
media/libvpx/libvpx/third_party/libyuv/source/convert_argb.cc
media/libvpx/libvpx/third_party/libyuv/source/convert_from.cc
media/libvpx/libvpx/third_party/libyuv/source/convert_from_argb.cc
media/libvpx/libvpx/third_party/libyuv/source/convert_jpeg.cc
media/libvpx/libvpx/third_party/libyuv/source/convert_to_argb.cc
media/libvpx/libvpx/third_party/libyuv/source/convert_to_i420.cc
media/libvpx/libvpx/third_party/libyuv/source/cpu_id.cc
media/libvpx/libvpx/third_party/libyuv/source/mjpeg_decoder.cc
media/libvpx/libvpx/third_party/libyuv/source/mjpeg_validate.cc
media/libvpx/libvpx/third_party/libyuv/source/planar_functions.cc
media/libvpx/libvpx/third_party/libyuv/source/rotate.cc
media/libvpx/libvpx/third_party/libyuv/source/rotate_any.cc
media/libvpx/libvpx/third_party/libyuv/source/rotate_gcc.cc
media/libvpx/libvpx/third_party/libyuv/source/rotate_mips.cc
media/libvpx/libvpx/third_party/libyuv/source/rotate_neon.cc
media/libvpx/libvpx/third_party/libyuv/source/rotate_neon64.cc
media/libvpx/libvpx/third_party/libyuv/source/rotate_win.cc
media/libvpx/libvpx/third_party/libyuv/source/row_any.cc
media/libvpx/libvpx/third_party/libyuv/source/row_common.cc
media/libvpx/libvpx/third_party/libyuv/source/row_gcc.cc
media/libvpx/libvpx/third_party/libyuv/source/row_mips.cc
media/libvpx/libvpx/third_party/libyuv/source/row_neon.cc
media/libvpx/libvpx/third_party/libyuv/source/row_neon64.cc
media/libvpx/libvpx/third_party/libyuv/source/row_win.cc
media/libvpx/libvpx/third_party/libyuv/source/row_x86.asm
media/libvpx/libvpx/third_party/libyuv/source/scale.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_any.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_argb.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_common.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_gcc.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_mips.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_neon.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_neon64.cc
media/libvpx/libvpx/third_party/libyuv/source/scale_win.cc
media/libvpx/libvpx/third_party/libyuv/source/video_common.cc
media/libvpx/libvpx/third_party/libyuv/source/x86inc.asm
media/libvpx/libvpx/tools.mk
media/libvpx/libvpx/tools/ftfy.sh
media/libvpx/libvpx/tools/gen_authors.sh
media/libvpx/libvpx/tools/tiny_ssim.c
media/libvpx/libvpx/tools/vpx-astyle.sh
media/libvpx/libvpx/tools_common.c
media/libvpx/libvpx/tools_common.h
media/libvpx/libvpx/video_reader.c
media/libvpx/libvpx/video_reader.h
media/libvpx/libvpx/video_writer.c
media/libvpx/libvpx/video_writer.h
media/libvpx/libvpx/vp8/common/alloccommon.c
media/libvpx/libvpx/vp8/common/alloccommon.h
media/libvpx/libvpx/vp8/common/arm/armv6/bilinearfilter_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/copymem16x16_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/copymem8x4_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/copymem8x8_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/dc_only_idct_add_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/dequant_idct_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/dequantize_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/filter_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/idct_blk_v6.c
media/libvpx/libvpx/vp8/common/arm/armv6/idct_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/iwalsh_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/loopfilter_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/simpleloopfilter_v6.asm
media/libvpx/libvpx/vp8/common/arm/armv6/sixtappredict8x4_v6.asm
media/libvpx/libvpx/vp8/common/arm/bilinearfilter_arm.c
media/libvpx/libvpx/vp8/common/arm/bilinearfilter_arm.h
media/libvpx/libvpx/vp8/common/arm/dequantize_arm.c
media/libvpx/libvpx/vp8/common/arm/filter_arm.c
media/libvpx/libvpx/vp8/common/arm/loopfilter_arm.c
media/libvpx/libvpx/vp8/common/arm/neon/bilinearpredict_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/copymem_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/dc_only_idct_add_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/dequant_idct_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/dequantizeb_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/idct_blk_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/idct_dequant_0_2x_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/idct_dequant_full_2x_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/iwalsh_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/loopfiltersimplehorizontaledge_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/loopfiltersimpleverticaledge_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/mbloopfilter_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/shortidct4x4llm_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/sixtappredict_neon.c
media/libvpx/libvpx/vp8/common/arm/neon/vp8_loopfilter_neon.c
media/libvpx/libvpx/vp8/common/blockd.c
media/libvpx/libvpx/vp8/common/blockd.h
media/libvpx/libvpx/vp8/common/coefupdateprobs.h
media/libvpx/libvpx/vp8/common/common.h
media/libvpx/libvpx/vp8/common/context.c
media/libvpx/libvpx/vp8/common/copy_c.c
media/libvpx/libvpx/vp8/common/debugmodes.c
media/libvpx/libvpx/vp8/common/default_coef_probs.h
media/libvpx/libvpx/vp8/common/dequantize.c
media/libvpx/libvpx/vp8/common/entropy.c
media/libvpx/libvpx/vp8/common/entropy.h
media/libvpx/libvpx/vp8/common/entropymode.c
media/libvpx/libvpx/vp8/common/entropymode.h
media/libvpx/libvpx/vp8/common/entropymv.c
media/libvpx/libvpx/vp8/common/entropymv.h
media/libvpx/libvpx/vp8/common/extend.c
media/libvpx/libvpx/vp8/common/extend.h
media/libvpx/libvpx/vp8/common/filter.c
media/libvpx/libvpx/vp8/common/filter.h
media/libvpx/libvpx/vp8/common/findnearmv.c
media/libvpx/libvpx/vp8/common/findnearmv.h
media/libvpx/libvpx/vp8/common/generic/systemdependent.c
media/libvpx/libvpx/vp8/common/header.h
media/libvpx/libvpx/vp8/common/idct_blk.c
media/libvpx/libvpx/vp8/common/idctllm.c
media/libvpx/libvpx/vp8/common/invtrans.h
media/libvpx/libvpx/vp8/common/loopfilter.h
media/libvpx/libvpx/vp8/common/loopfilter_filters.c
media/libvpx/libvpx/vp8/common/mbpitch.c
media/libvpx/libvpx/vp8/common/mfqe.c
media/libvpx/libvpx/vp8/common/mips/dspr2/dequantize_dspr2.c
media/libvpx/libvpx/vp8/common/mips/dspr2/filter_dspr2.c
media/libvpx/libvpx/vp8/common/mips/dspr2/idct_blk_dspr2.c
media/libvpx/libvpx/vp8/common/mips/dspr2/idctllm_dspr2.c
media/libvpx/libvpx/vp8/common/mips/dspr2/reconinter_dspr2.c
media/libvpx/libvpx/vp8/common/mips/dspr2/vp8_loopfilter_filters_dspr2.c
media/libvpx/libvpx/vp8/common/mips/msa/bilinear_filter_msa.c
media/libvpx/libvpx/vp8/common/mips/msa/copymem_msa.c
media/libvpx/libvpx/vp8/common/mips/msa/idct_msa.c
media/libvpx/libvpx/vp8/common/mips/msa/loopfilter_filters_msa.c
media/libvpx/libvpx/vp8/common/mips/msa/mfqe_msa.c
media/libvpx/libvpx/vp8/common/mips/msa/postproc_msa.c
media/libvpx/libvpx/vp8/common/mips/msa/sixtap_filter_msa.c
media/libvpx/libvpx/vp8/common/mips/msa/vp8_macros_msa.h
media/libvpx/libvpx/vp8/common/modecont.c
media/libvpx/libvpx/vp8/common/modecont.h
media/libvpx/libvpx/vp8/common/mv.h
media/libvpx/libvpx/vp8/common/onyx.h
media/libvpx/libvpx/vp8/common/onyxc_int.h
media/libvpx/libvpx/vp8/common/onyxd.h
media/libvpx/libvpx/vp8/common/postproc.c
media/libvpx/libvpx/vp8/common/postproc.h
media/libvpx/libvpx/vp8/common/ppflags.h
media/libvpx/libvpx/vp8/common/quant_common.c
media/libvpx/libvpx/vp8/common/quant_common.h
media/libvpx/libvpx/vp8/common/reconinter.c
media/libvpx/libvpx/vp8/common/reconinter.h
media/libvpx/libvpx/vp8/common/reconintra.c
media/libvpx/libvpx/vp8/common/reconintra.h
media/libvpx/libvpx/vp8/common/reconintra4x4.c
media/libvpx/libvpx/vp8/common/reconintra4x4.h
media/libvpx/libvpx/vp8/common/rtcd.c
media/libvpx/libvpx/vp8/common/rtcd_defs.pl
media/libvpx/libvpx/vp8/common/setupintrarecon.c
media/libvpx/libvpx/vp8/common/setupintrarecon.h
media/libvpx/libvpx/vp8/common/swapyv12buffer.c
media/libvpx/libvpx/vp8/common/swapyv12buffer.h
media/libvpx/libvpx/vp8/common/textblit.c
media/libvpx/libvpx/vp8/common/threading.h
media/libvpx/libvpx/vp8/common/treecoder.c
media/libvpx/libvpx/vp8/common/treecoder.h
media/libvpx/libvpx/vp8/common/vp8_entropymodedata.h
media/libvpx/libvpx/vp8/common/vp8_loopfilter.c
media/libvpx/libvpx/vp8/common/x86/filter_x86.c
media/libvpx/libvpx/vp8/common/x86/idct_blk_mmx.c
media/libvpx/libvpx/vp8/common/x86/idct_blk_sse2.c
media/libvpx/libvpx/vp8/common/x86/iwalsh_mmx.asm
media/libvpx/libvpx/vp8/common/x86/loopfilter_x86.c
media/libvpx/libvpx/vp8/common/x86/mfqe_sse2.asm
media/libvpx/libvpx/vp8/common/x86/postproc_mmx.asm
media/libvpx/libvpx/vp8/common/x86/postproc_sse2.asm
media/libvpx/libvpx/vp8/common/x86/recon_mmx.asm
media/libvpx/libvpx/vp8/common/x86/subpixel_mmx.asm
media/libvpx/libvpx/vp8/common/x86/subpixel_sse2.asm
media/libvpx/libvpx/vp8/common/x86/subpixel_ssse3.asm
media/libvpx/libvpx/vp8/common/x86/vp8_asm_stubs.c
media/libvpx/libvpx/vp8/common/x86/vp8_loopfilter_mmx.asm
media/libvpx/libvpx/vp8/decoder/dboolhuff.c
media/libvpx/libvpx/vp8/decoder/dboolhuff.h
media/libvpx/libvpx/vp8/decoder/decodeframe.c
media/libvpx/libvpx/vp8/decoder/decodemv.c
media/libvpx/libvpx/vp8/decoder/detokenize.c
media/libvpx/libvpx/vp8/decoder/ec_types.h
media/libvpx/libvpx/vp8/decoder/error_concealment.c
media/libvpx/libvpx/vp8/decoder/error_concealment.h
media/libvpx/libvpx/vp8/decoder/onyxd_if.c
media/libvpx/libvpx/vp8/decoder/onyxd_int.h
media/libvpx/libvpx/vp8/decoder/threading.c
media/libvpx/libvpx/vp8/decoder/treereader.h
media/libvpx/libvpx/vp8/encoder/arm/armv6/vp8_short_fdct4x4_armv6.asm
media/libvpx/libvpx/vp8/encoder/arm/armv6/walsh_v6.asm
media/libvpx/libvpx/vp8/encoder/arm/dct_arm.c
media/libvpx/libvpx/vp8/encoder/arm/neon/denoising_neon.c
media/libvpx/libvpx/vp8/encoder/arm/neon/fastquantizeb_neon.c
media/libvpx/libvpx/vp8/encoder/arm/neon/shortfdct_neon.c
media/libvpx/libvpx/vp8/encoder/arm/neon/vp8_shortwalsh4x4_neon.c
media/libvpx/libvpx/vp8/encoder/bitstream.c
media/libvpx/libvpx/vp8/encoder/bitstream.h
media/libvpx/libvpx/vp8/encoder/block.h
media/libvpx/libvpx/vp8/encoder/boolhuff.c
media/libvpx/libvpx/vp8/encoder/boolhuff.h
media/libvpx/libvpx/vp8/encoder/dct.c
media/libvpx/libvpx/vp8/encoder/dct_value_cost.h
media/libvpx/libvpx/vp8/encoder/dct_value_tokens.h
media/libvpx/libvpx/vp8/encoder/defaultcoefcounts.h
media/libvpx/libvpx/vp8/encoder/denoising.c
media/libvpx/libvpx/vp8/encoder/denoising.h
media/libvpx/libvpx/vp8/encoder/encodeframe.c
media/libvpx/libvpx/vp8/encoder/encodeframe.h
media/libvpx/libvpx/vp8/encoder/encodeintra.c
media/libvpx/libvpx/vp8/encoder/encodeintra.h
media/libvpx/libvpx/vp8/encoder/encodemb.c
media/libvpx/libvpx/vp8/encoder/encodemb.h
media/libvpx/libvpx/vp8/encoder/encodemv.c
media/libvpx/libvpx/vp8/encoder/encodemv.h
media/libvpx/libvpx/vp8/encoder/ethreading.c
media/libvpx/libvpx/vp8/encoder/firstpass.c
media/libvpx/libvpx/vp8/encoder/firstpass.h
media/libvpx/libvpx/vp8/encoder/lookahead.c
media/libvpx/libvpx/vp8/encoder/lookahead.h
media/libvpx/libvpx/vp8/encoder/mcomp.c
media/libvpx/libvpx/vp8/encoder/mcomp.h
media/libvpx/libvpx/vp8/encoder/mips/msa/dct_msa.c
media/libvpx/libvpx/vp8/encoder/mips/msa/denoising_msa.c
media/libvpx/libvpx/vp8/encoder/mips/msa/encodeopt_msa.c
media/libvpx/libvpx/vp8/encoder/mips/msa/quantize_msa.c
media/libvpx/libvpx/vp8/encoder/mips/msa/temporal_filter_msa.c
media/libvpx/libvpx/vp8/encoder/modecosts.c
media/libvpx/libvpx/vp8/encoder/modecosts.h
media/libvpx/libvpx/vp8/encoder/mr_dissim.c
media/libvpx/libvpx/vp8/encoder/mr_dissim.h
media/libvpx/libvpx/vp8/encoder/onyx_if.c
media/libvpx/libvpx/vp8/encoder/onyx_int.h
media/libvpx/libvpx/vp8/encoder/pickinter.c
media/libvpx/libvpx/vp8/encoder/pickinter.h
media/libvpx/libvpx/vp8/encoder/picklpf.c
media/libvpx/libvpx/vp8/encoder/quantize.h
media/libvpx/libvpx/vp8/encoder/ratectrl.c
media/libvpx/libvpx/vp8/encoder/ratectrl.h
media/libvpx/libvpx/vp8/encoder/rdopt.c
media/libvpx/libvpx/vp8/encoder/rdopt.h
media/libvpx/libvpx/vp8/encoder/segmentation.c
media/libvpx/libvpx/vp8/encoder/segmentation.h
media/libvpx/libvpx/vp8/encoder/temporal_filter.c
media/libvpx/libvpx/vp8/encoder/tokenize.c
media/libvpx/libvpx/vp8/encoder/tokenize.h
media/libvpx/libvpx/vp8/encoder/treewriter.c
media/libvpx/libvpx/vp8/encoder/treewriter.h
media/libvpx/libvpx/vp8/encoder/vp8_quantize.c
media/libvpx/libvpx/vp8/encoder/x86/dct_mmx.asm
media/libvpx/libvpx/vp8/encoder/x86/denoising_sse2.c
media/libvpx/libvpx/vp8/encoder/x86/encodeopt.asm
media/libvpx/libvpx/vp8/encoder/x86/quantize_sse4.c
media/libvpx/libvpx/vp8/encoder/x86/quantize_ssse3.c
media/libvpx/libvpx/vp8/encoder/x86/vp8_enc_stubs_mmx.c
media/libvpx/libvpx/vp8/encoder/x86/vp8_enc_stubs_sse2.c
media/libvpx/libvpx/vp8/encoder/x86/vp8_quantize_sse2.c
media/libvpx/libvpx/vp8/vp8_common.mk
media/libvpx/libvpx/vp8/vp8_cx_iface.c
media/libvpx/libvpx/vp8/vp8_dx_iface.c
media/libvpx/libvpx/vp8/vp8cx.mk
media/libvpx/libvpx/vp8/vp8cx_arm.mk
media/libvpx/libvpx/vp9/common/arm/neon/vp9_iht4x4_add_neon.c
media/libvpx/libvpx/vp9/common/arm/neon/vp9_iht8x8_add_neon.c
media/libvpx/libvpx/vp9/common/mips/dspr2/vp9_itrans16_dspr2.c
media/libvpx/libvpx/vp9/common/mips/dspr2/vp9_itrans4_dspr2.c
media/libvpx/libvpx/vp9/common/mips/dspr2/vp9_itrans8_dspr2.c
media/libvpx/libvpx/vp9/common/mips/msa/vp9_idct16x16_msa.c
media/libvpx/libvpx/vp9/common/mips/msa/vp9_idct4x4_msa.c
media/libvpx/libvpx/vp9/common/mips/msa/vp9_idct8x8_msa.c
media/libvpx/libvpx/vp9/common/mips/msa/vp9_mfqe_msa.c
media/libvpx/libvpx/vp9/common/vp9_alloccommon.c
media/libvpx/libvpx/vp9/common/vp9_alloccommon.h
media/libvpx/libvpx/vp9/common/vp9_blockd.c
media/libvpx/libvpx/vp9/common/vp9_blockd.h
media/libvpx/libvpx/vp9/common/vp9_common.h
media/libvpx/libvpx/vp9/common/vp9_common_data.c
media/libvpx/libvpx/vp9/common/vp9_common_data.h
media/libvpx/libvpx/vp9/common/vp9_debugmodes.c
media/libvpx/libvpx/vp9/common/vp9_entropy.c
media/libvpx/libvpx/vp9/common/vp9_entropy.h
media/libvpx/libvpx/vp9/common/vp9_entropymode.c
media/libvpx/libvpx/vp9/common/vp9_entropymode.h
media/libvpx/libvpx/vp9/common/vp9_entropymv.c
media/libvpx/libvpx/vp9/common/vp9_entropymv.h
media/libvpx/libvpx/vp9/common/vp9_enums.h
media/libvpx/libvpx/vp9/common/vp9_filter.c
media/libvpx/libvpx/vp9/common/vp9_filter.h
media/libvpx/libvpx/vp9/common/vp9_frame_buffers.c
media/libvpx/libvpx/vp9/common/vp9_idct.c
media/libvpx/libvpx/vp9/common/vp9_idct.h
media/libvpx/libvpx/vp9/common/vp9_loopfilter.c
media/libvpx/libvpx/vp9/common/vp9_loopfilter.h
media/libvpx/libvpx/vp9/common/vp9_mfqe.c
media/libvpx/libvpx/vp9/common/vp9_mv.h
media/libvpx/libvpx/vp9/common/vp9_mvref_common.c
media/libvpx/libvpx/vp9/common/vp9_mvref_common.h
media/libvpx/libvpx/vp9/common/vp9_onyxc_int.h
media/libvpx/libvpx/vp9/common/vp9_postproc.c
media/libvpx/libvpx/vp9/common/vp9_postproc.h
media/libvpx/libvpx/vp9/common/vp9_ppflags.h
media/libvpx/libvpx/vp9/common/vp9_pred_common.c
media/libvpx/libvpx/vp9/common/vp9_pred_common.h
media/libvpx/libvpx/vp9/common/vp9_quant_common.c
media/libvpx/libvpx/vp9/common/vp9_reconinter.c
media/libvpx/libvpx/vp9/common/vp9_reconinter.h
media/libvpx/libvpx/vp9/common/vp9_reconintra.c
media/libvpx/libvpx/vp9/common/vp9_reconintra.h
media/libvpx/libvpx/vp9/common/vp9_rtcd.c
media/libvpx/libvpx/vp9/common/vp9_rtcd_defs.pl
media/libvpx/libvpx/vp9/common/vp9_scale.c
media/libvpx/libvpx/vp9/common/vp9_scale.h
media/libvpx/libvpx/vp9/common/vp9_scan.c
media/libvpx/libvpx/vp9/common/vp9_scan.h
media/libvpx/libvpx/vp9/common/vp9_seg_common.c
media/libvpx/libvpx/vp9/common/vp9_seg_common.h
media/libvpx/libvpx/vp9/common/vp9_textblit.c
media/libvpx/libvpx/vp9/common/vp9_textblit.h
media/libvpx/libvpx/vp9/common/vp9_thread_common.c
media/libvpx/libvpx/vp9/common/vp9_thread_common.h
media/libvpx/libvpx/vp9/common/vp9_tile_common.c
media/libvpx/libvpx/vp9/common/vp9_tile_common.h
media/libvpx/libvpx/vp9/common/x86/vp9_idct_intrin_sse2.c
media/libvpx/libvpx/vp9/common/x86/vp9_mfqe_sse2.asm
media/libvpx/libvpx/vp9/common/x86/vp9_postproc_sse2.asm
media/libvpx/libvpx/vp9/decoder/vp9_decodeframe.c
media/libvpx/libvpx/vp9/decoder/vp9_decodeframe.h
media/libvpx/libvpx/vp9/decoder/vp9_decodemv.c
media/libvpx/libvpx/vp9/decoder/vp9_decodemv.h
media/libvpx/libvpx/vp9/decoder/vp9_decoder.c
media/libvpx/libvpx/vp9/decoder/vp9_decoder.h
media/libvpx/libvpx/vp9/decoder/vp9_detokenize.c
media/libvpx/libvpx/vp9/decoder/vp9_detokenize.h
media/libvpx/libvpx/vp9/decoder/vp9_dsubexp.c
media/libvpx/libvpx/vp9/decoder/vp9_dsubexp.h
media/libvpx/libvpx/vp9/decoder/vp9_dthread.c
media/libvpx/libvpx/vp9/decoder/vp9_dthread.h
media/libvpx/libvpx/vp9/encoder/arm/neon/vp9_dct_neon.c
media/libvpx/libvpx/vp9/encoder/arm/neon/vp9_quantize_neon.c
media/libvpx/libvpx/vp9/encoder/mips/msa/vp9_error_msa.c
media/libvpx/libvpx/vp9/encoder/mips/msa/vp9_fdct16x16_msa.c
media/libvpx/libvpx/vp9/encoder/mips/msa/vp9_fdct4x4_msa.c
media/libvpx/libvpx/vp9/encoder/mips/msa/vp9_fdct8x8_msa.c
media/libvpx/libvpx/vp9/encoder/mips/msa/vp9_fdct_msa.h
media/libvpx/libvpx/vp9/encoder/mips/msa/vp9_temporal_filter_msa.c
media/libvpx/libvpx/vp9/encoder/vp9_alt_ref_aq.c
media/libvpx/libvpx/vp9/encoder/vp9_alt_ref_aq.h
media/libvpx/libvpx/vp9/encoder/vp9_aq_360.c
media/libvpx/libvpx/vp9/encoder/vp9_aq_360.h
media/libvpx/libvpx/vp9/encoder/vp9_aq_complexity.c
media/libvpx/libvpx/vp9/encoder/vp9_aq_complexity.h
media/libvpx/libvpx/vp9/encoder/vp9_aq_cyclicrefresh.c
media/libvpx/libvpx/vp9/encoder/vp9_aq_cyclicrefresh.h
media/libvpx/libvpx/vp9/encoder/vp9_aq_variance.c
media/libvpx/libvpx/vp9/encoder/vp9_aq_variance.h
media/libvpx/libvpx/vp9/encoder/vp9_bitstream.c
media/libvpx/libvpx/vp9/encoder/vp9_bitstream.h
media/libvpx/libvpx/vp9/encoder/vp9_block.h
media/libvpx/libvpx/vp9/encoder/vp9_blockiness.c
media/libvpx/libvpx/vp9/encoder/vp9_context_tree.c
media/libvpx/libvpx/vp9/encoder/vp9_cost.c
media/libvpx/libvpx/vp9/encoder/vp9_cost.h
media/libvpx/libvpx/vp9/encoder/vp9_dct.c
media/libvpx/libvpx/vp9/encoder/vp9_denoiser.c
media/libvpx/libvpx/vp9/encoder/vp9_denoiser.h
media/libvpx/libvpx/vp9/encoder/vp9_encodeframe.c
media/libvpx/libvpx/vp9/encoder/vp9_encodeframe.h
media/libvpx/libvpx/vp9/encoder/vp9_encodemb.c
media/libvpx/libvpx/vp9/encoder/vp9_encodemb.h
media/libvpx/libvpx/vp9/encoder/vp9_encodemv.c
media/libvpx/libvpx/vp9/encoder/vp9_encodemv.h
media/libvpx/libvpx/vp9/encoder/vp9_encoder.c
media/libvpx/libvpx/vp9/encoder/vp9_encoder.h
media/libvpx/libvpx/vp9/encoder/vp9_ethread.c
media/libvpx/libvpx/vp9/encoder/vp9_extend.c
media/libvpx/libvpx/vp9/encoder/vp9_extend.h
media/libvpx/libvpx/vp9/encoder/vp9_firstpass.c
media/libvpx/libvpx/vp9/encoder/vp9_firstpass.h
media/libvpx/libvpx/vp9/encoder/vp9_lookahead.c
media/libvpx/libvpx/vp9/encoder/vp9_lookahead.h
media/libvpx/libvpx/vp9/encoder/vp9_mbgraph.c
media/libvpx/libvpx/vp9/encoder/vp9_mbgraph.h
media/libvpx/libvpx/vp9/encoder/vp9_mcomp.c
media/libvpx/libvpx/vp9/encoder/vp9_mcomp.h
media/libvpx/libvpx/vp9/encoder/vp9_noise_estimate.c
media/libvpx/libvpx/vp9/encoder/vp9_noise_estimate.h
media/libvpx/libvpx/vp9/encoder/vp9_picklpf.c
media/libvpx/libvpx/vp9/encoder/vp9_picklpf.h
media/libvpx/libvpx/vp9/encoder/vp9_pickmode.c
media/libvpx/libvpx/vp9/encoder/vp9_pickmode.h
media/libvpx/libvpx/vp9/encoder/vp9_quantize.c
media/libvpx/libvpx/vp9/encoder/vp9_ratectrl.c
media/libvpx/libvpx/vp9/encoder/vp9_ratectrl.h
media/libvpx/libvpx/vp9/encoder/vp9_rd.c
media/libvpx/libvpx/vp9/encoder/vp9_rd.h
media/libvpx/libvpx/vp9/encoder/vp9_rdopt.c
media/libvpx/libvpx/vp9/encoder/vp9_rdopt.h
media/libvpx/libvpx/vp9/encoder/vp9_resize.c
media/libvpx/libvpx/vp9/encoder/vp9_resize.h
media/libvpx/libvpx/vp9/encoder/vp9_segmentation.c
media/libvpx/libvpx/vp9/encoder/vp9_segmentation.h
media/libvpx/libvpx/vp9/encoder/vp9_skin_detection.c
media/libvpx/libvpx/vp9/encoder/vp9_speed_features.c
media/libvpx/libvpx/vp9/encoder/vp9_speed_features.h
media/libvpx/libvpx/vp9/encoder/vp9_subexp.c
media/libvpx/libvpx/vp9/encoder/vp9_subexp.h
media/libvpx/libvpx/vp9/encoder/vp9_svc_layercontext.c
media/libvpx/libvpx/vp9/encoder/vp9_svc_layercontext.h
media/libvpx/libvpx/vp9/encoder/vp9_temporal_filter.c
media/libvpx/libvpx/vp9/encoder/vp9_tokenize.c
media/libvpx/libvpx/vp9/encoder/vp9_tokenize.h
media/libvpx/libvpx/vp9/encoder/vp9_treewriter.h
media/libvpx/libvpx/vp9/encoder/x86/vp9_dct_intrin_sse2.c
media/libvpx/libvpx/vp9/encoder/x86/vp9_dct_ssse3.c
media/libvpx/libvpx/vp9/encoder/x86/vp9_denoiser_sse2.c
media/libvpx/libvpx/vp9/encoder/x86/vp9_diamond_search_sad_avx.c
media/libvpx/libvpx/vp9/encoder/x86/vp9_error_intrin_avx2.c
media/libvpx/libvpx/vp9/encoder/x86/vp9_frame_scale_ssse3.c
media/libvpx/libvpx/vp9/encoder/x86/vp9_highbd_block_error_intrin_sse2.c
media/libvpx/libvpx/vp9/encoder/x86/vp9_quantize_sse2.c
media/libvpx/libvpx/vp9/vp9_common.mk
media/libvpx/libvpx/vp9/vp9_cx_iface.c
media/libvpx/libvpx/vp9/vp9_dx_iface.c
media/libvpx/libvpx/vp9/vp9_dx_iface.h
media/libvpx/libvpx/vp9/vp9_iface_common.h
media/libvpx/libvpx/vp9/vp9cx.mk
media/libvpx/libvpx/vpx/internal/vpx_codec_internal.h
media/libvpx/libvpx/vpx/internal/vpx_psnr.h
media/libvpx/libvpx/vpx/src/svc_encodeframe.c
media/libvpx/libvpx/vpx/src/vpx_codec.c
media/libvpx/libvpx/vpx/src/vpx_decoder.c
media/libvpx/libvpx/vpx/src/vpx_encoder.c
media/libvpx/libvpx/vpx/src/vpx_image.c
media/libvpx/libvpx/vpx/src/vpx_psnr.c
media/libvpx/libvpx/vpx/svc_context.h
media/libvpx/libvpx/vpx/vp8.h
media/libvpx/libvpx/vpx/vp8cx.h
media/libvpx/libvpx/vpx/vp8dx.h
media/libvpx/libvpx/vpx/vpx_codec.h
media/libvpx/libvpx/vpx/vpx_codec.mk
media/libvpx/libvpx/vpx/vpx_decoder.h
media/libvpx/libvpx/vpx/vpx_encoder.h
media/libvpx/libvpx/vpx/vpx_frame_buffer.h
media/libvpx/libvpx/vpx/vpx_image.h
media/libvpx/libvpx/vpx/vpx_integer.h
media/libvpx/libvpx/vpx_dsp/add_noise.c
media/libvpx/libvpx/vpx_dsp/arm/avg_neon.c
media/libvpx/libvpx/vpx_dsp/arm/bilinear_filter_media.asm
media/libvpx/libvpx/vpx_dsp/arm/deblock_neon.c
media/libvpx/libvpx/vpx_dsp/arm/fwd_txfm_neon.c
media/libvpx/libvpx/vpx_dsp/arm/hadamard_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_idct4x4_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_idct8x8_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_intrapred_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_loopfilter_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_vpx_convolve8_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_vpx_convolve_avg_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_vpx_convolve_copy_neon.c
media/libvpx/libvpx/vpx_dsp/arm/highbd_vpx_convolve_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct16x16_1_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct16x16_1_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct16x16_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct16x16_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct16x16_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct32x32_135_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct32x32_1_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct32x32_34_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct32x32_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct32x32_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct4x4_1_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct4x4_1_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct4x4_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct4x4_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct8x8_1_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct8x8_1_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct8x8_add_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct8x8_add_neon.c
media/libvpx/libvpx/vpx_dsp/arm/idct_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/idct_neon.h
media/libvpx/libvpx/vpx_dsp/arm/intrapred_neon.c
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_16_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_16_neon.c
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_4_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_4_neon.c
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_8_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_8_neon.c
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_mb_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/loopfilter_neon.c
media/libvpx/libvpx/vpx_dsp/arm/sad4d_neon.c
media/libvpx/libvpx/vpx_dsp/arm/sad_media.asm
media/libvpx/libvpx/vpx_dsp/arm/sad_neon.c
media/libvpx/libvpx/vpx_dsp/arm/save_reg_neon.asm
media/libvpx/libvpx/vpx_dsp/arm/subpel_variance_media.c
media/libvpx/libvpx/vpx_dsp/arm/subpel_variance_neon.c
media/libvpx/libvpx/vpx_dsp/arm/subtract_neon.c
media/libvpx/libvpx/vpx_dsp/arm/transpose_neon.h
media/libvpx/libvpx/vpx_dsp/arm/variance_halfpixvar16x16_h_media.asm
media/libvpx/libvpx/vpx_dsp/arm/variance_halfpixvar16x16_hv_media.asm
media/libvpx/libvpx/vpx_dsp/arm/variance_halfpixvar16x16_v_media.asm
media/libvpx/libvpx/vpx_dsp/arm/variance_media.asm
media/libvpx/libvpx/vpx_dsp/arm/variance_neon.c
media/libvpx/libvpx/vpx_dsp/arm/vpx_convolve8_avg_neon.c
media/libvpx/libvpx/vpx_dsp/arm/vpx_convolve8_neon.c
media/libvpx/libvpx/vpx_dsp/arm/vpx_convolve_avg_neon.c
media/libvpx/libvpx/vpx_dsp/arm/vpx_convolve_copy_neon.c
media/libvpx/libvpx/vpx_dsp/arm/vpx_convolve_neon.c
media/libvpx/libvpx/vpx_dsp/avg.c
media/libvpx/libvpx/vpx_dsp/bitreader.c
media/libvpx/libvpx/vpx_dsp/bitreader.h
media/libvpx/libvpx/vpx_dsp/bitreader_buffer.c
media/libvpx/libvpx/vpx_dsp/bitwriter.c
media/libvpx/libvpx/vpx_dsp/bitwriter.h
media/libvpx/libvpx/vpx_dsp/bitwriter_buffer.c
media/libvpx/libvpx/vpx_dsp/deblock.c
media/libvpx/libvpx/vpx_dsp/fastssim.c
media/libvpx/libvpx/vpx_dsp/fwd_txfm.c
media/libvpx/libvpx/vpx_dsp/intrapred.c
media/libvpx/libvpx/vpx_dsp/inv_txfm.c
media/libvpx/libvpx/vpx_dsp/inv_txfm.h
media/libvpx/libvpx/vpx_dsp/loopfilter.c
media/libvpx/libvpx/vpx_dsp/mips/add_noise_msa.c
media/libvpx/libvpx/vpx_dsp/mips/common_dspr2.h
media/libvpx/libvpx/vpx_dsp/mips/convolve2_avg_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve2_avg_horiz_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve2_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve2_horiz_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve2_vert_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve8_avg_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve8_avg_horiz_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve8_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve8_horiz_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve8_vert_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/convolve_common_dspr2.h
media/libvpx/libvpx/vpx_dsp/mips/deblock_msa.c
media/libvpx/libvpx/vpx_dsp/mips/fwd_dct32x32_msa.c
media/libvpx/libvpx/vpx_dsp/mips/fwd_txfm_msa.c
media/libvpx/libvpx/vpx_dsp/mips/fwd_txfm_msa.h
media/libvpx/libvpx/vpx_dsp/mips/idct16x16_msa.c
media/libvpx/libvpx/vpx_dsp/mips/idct32x32_msa.c
media/libvpx/libvpx/vpx_dsp/mips/idct4x4_msa.c
media/libvpx/libvpx/vpx_dsp/mips/idct8x8_msa.c
media/libvpx/libvpx/vpx_dsp/mips/intrapred16_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/intrapred4_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/intrapred8_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/intrapred_msa.c
media/libvpx/libvpx/vpx_dsp/mips/inv_txfm_dspr2.h
media/libvpx/libvpx/vpx_dsp/mips/inv_txfm_msa.h
media/libvpx/libvpx/vpx_dsp/mips/itrans16_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/itrans32_cols_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/itrans32_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/itrans4_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/itrans8_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_16_msa.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_4_msa.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_8_msa.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_filters_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_filters_dspr2.h
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_macros_dspr2.h
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_masks_dspr2.h
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_mb_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_mb_horiz_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_mb_vert_dspr2.c
media/libvpx/libvpx/vpx_dsp/mips/loopfilter_msa.h
media/libvpx/libvpx/vpx_dsp/mips/macros_msa.h
media/libvpx/libvpx/vpx_dsp/mips/sad_msa.c
media/libvpx/libvpx/vpx_dsp/mips/sub_pixel_variance_msa.c
media/libvpx/libvpx/vpx_dsp/mips/subtract_msa.c
media/libvpx/libvpx/vpx_dsp/mips/txfm_macros_msa.h
media/libvpx/libvpx/vpx_dsp/mips/variance_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve8_avg_horiz_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve8_avg_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve8_avg_vert_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve8_horiz_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve8_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve8_vert_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve_avg_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve_copy_msa.c
media/libvpx/libvpx/vpx_dsp/mips/vpx_convolve_msa.h
media/libvpx/libvpx/vpx_dsp/postproc.h
media/libvpx/libvpx/vpx_dsp/prob.c
media/libvpx/libvpx/vpx_dsp/prob.h
media/libvpx/libvpx/vpx_dsp/psnr.c
media/libvpx/libvpx/vpx_dsp/psnr.h
media/libvpx/libvpx/vpx_dsp/psnrhvs.c
media/libvpx/libvpx/vpx_dsp/quantize.c
media/libvpx/libvpx/vpx_dsp/quantize.h
media/libvpx/libvpx/vpx_dsp/sad.c
media/libvpx/libvpx/vpx_dsp/ssim.c
media/libvpx/libvpx/vpx_dsp/ssim.h
media/libvpx/libvpx/vpx_dsp/subtract.c
media/libvpx/libvpx/vpx_dsp/sum_squares.c
media/libvpx/libvpx/vpx_dsp/txfm_common.h
media/libvpx/libvpx/vpx_dsp/variance.c
media/libvpx/libvpx/vpx_dsp/variance.h
media/libvpx/libvpx/vpx_dsp/vpx_convolve.c
media/libvpx/libvpx/vpx_dsp/vpx_convolve.h
media/libvpx/libvpx/vpx_dsp/vpx_dsp.mk
media/libvpx/libvpx/vpx_dsp/vpx_dsp_common.h
media/libvpx/libvpx/vpx_dsp/vpx_dsp_rtcd.c
media/libvpx/libvpx/vpx_dsp/vpx_dsp_rtcd_defs.pl
media/libvpx/libvpx/vpx_dsp/vpx_filter.h
media/libvpx/libvpx/vpx_dsp/x86/add_noise_sse2.asm
media/libvpx/libvpx/vpx_dsp/x86/avg_intrin_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/convolve.h
media/libvpx/libvpx/vpx_dsp/x86/deblock_sse2.asm
media/libvpx/libvpx/vpx_dsp/x86/fdct.h
media/libvpx/libvpx/vpx_dsp/x86/fwd_dct32x32_impl_avx2.h
media/libvpx/libvpx/vpx_dsp/x86/fwd_dct32x32_impl_sse2.h
media/libvpx/libvpx/vpx_dsp/x86/fwd_txfm_avx2.c
media/libvpx/libvpx/vpx_dsp/x86/fwd_txfm_impl_sse2.h
media/libvpx/libvpx/vpx_dsp/x86/fwd_txfm_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/fwd_txfm_sse2.h
media/libvpx/libvpx/vpx_dsp/x86/halfpix_variance_impl_sse2.asm
media/libvpx/libvpx/vpx_dsp/x86/halfpix_variance_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/highbd_loopfilter_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/highbd_quantize_intrin_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/highbd_variance_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/intrapred_sse2.asm
media/libvpx/libvpx/vpx_dsp/x86/inv_txfm_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/inv_txfm_sse2.h
media/libvpx/libvpx/vpx_dsp/x86/inv_txfm_ssse3_x86_64.asm
media/libvpx/libvpx/vpx_dsp/x86/loopfilter_avx2.c
media/libvpx/libvpx/vpx_dsp/x86/loopfilter_intrin_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/quantize_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/sad4d_avx2.c
media/libvpx/libvpx/vpx_dsp/x86/sad_avx2.c
media/libvpx/libvpx/vpx_dsp/x86/sum_squares_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/txfm_common_sse2.h
media/libvpx/libvpx/vpx_dsp/x86/variance_avx2.c
media/libvpx/libvpx/vpx_dsp/x86/variance_impl_avx2.c
media/libvpx/libvpx/vpx_dsp/x86/variance_sse2.c
media/libvpx/libvpx/vpx_dsp/x86/vpx_asm_stubs.c
media/libvpx/libvpx/vpx_dsp/x86/vpx_convolve_copy_sse2.asm
media/libvpx/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_avx2.c
media/libvpx/libvpx/vpx_dsp/x86/vpx_subpixel_8t_intrin_ssse3.c
media/libvpx/libvpx/vpx_dsp/x86/vpx_subpixel_8t_ssse3.asm
media/libvpx/libvpx/vpx_dsp/x86/vpx_subpixel_bilinear_ssse3.asm
media/libvpx/libvpx/vpx_mem/include/vpx_mem_intrnl.h
media/libvpx/libvpx/vpx_mem/vpx_mem.c
media/libvpx/libvpx/vpx_mem/vpx_mem.h
media/libvpx/libvpx/vpx_ports/arm.h
media/libvpx/libvpx/vpx_ports/arm_cpudetect.c
media/libvpx/libvpx/vpx_ports/bitops.h
media/libvpx/libvpx/vpx_ports/emmintrin_compat.h
media/libvpx/libvpx/vpx_ports/mem.h
media/libvpx/libvpx/vpx_ports/mem_ops.h
media/libvpx/libvpx/vpx_ports/mem_ops_aligned.h
media/libvpx/libvpx/vpx_ports/msvc.h
media/libvpx/libvpx/vpx_ports/vpx_once.h
media/libvpx/libvpx/vpx_ports/vpx_timer.h
media/libvpx/libvpx/vpx_ports/x86.h
media/libvpx/libvpx/vpx_scale/generic/gen_scalers.c
media/libvpx/libvpx/vpx_scale/generic/vpx_scale.c
media/libvpx/libvpx/vpx_scale/generic/yv12config.c
media/libvpx/libvpx/vpx_scale/generic/yv12extend.c
media/libvpx/libvpx/vpx_scale/mips/dspr2/yv12extend_dspr2.c
media/libvpx/libvpx/vpx_scale/vpx_scale.h
media/libvpx/libvpx/vpx_scale/vpx_scale_rtcd.c
media/libvpx/libvpx/vpx_scale/yv12config.h
media/libvpx/libvpx/vpx_util/endian_inl.h
media/libvpx/libvpx/vpx_util/vpx_thread.c
media/libvpx/libvpx/vpx_util/vpx_thread.h
media/libvpx/libvpx/vpxdec.c
media/libvpx/libvpx/vpxenc.c
media/libvpx/libvpx/vpxstats.c
media/libvpx/libvpx/warnings.c
media/libvpx/libvpx/webmdec.cc
media/libvpx/libvpx/webmdec.h
media/libvpx/libvpx/webmenc.cc
media/libvpx/libvpx/webmenc.h
media/libvpx/libvpx/y4menc.c
media/libvpx/libvpx/y4minput.c
media/libvpx/libvpx/y4minput.h
media/libvpx/moz.build
media/libvpx/rename_duplicate_files.patch
media/libvpx/sources.mozbuild
media/libvpx/stdint.patch
media/libvpx/update.py
--- a/media/libvpx/Makefile.in
+++ b/media/libvpx/Makefile.in
@@ -5,15 +5,18 @@
 # Set up the libvpx assembler config.
 
 ifdef VPX_ARM_ASM
 
 ifdef VPX_AS_CONVERSION
 # The ARM asm is written in ARM RVCT syntax, but we actually build it with
 # gas using GNU syntax. Add some rules to perform the conversion.
 
-GENERATED_DIRS += $(dir $(ASFILES))
+# Previously used $(dir $(ASFILES)) to figure out which directories to generate.
+# However, .S (as opposed to .s) files are not added to ASFILES. There is only
+# one directory with arm assembly currently so enumerate it manually.
+GENERATED_DIRS += libvpx/vpx_dsp/arm
 
-%.asm.s: %.asm $(ASM_OFFSETS)
+%.asm.S: %.asm $(ASM_OFFSETS)
 	$(VPX_AS_CONVERSION) < $< > $@
 
 endif
 endif
--- a/media/libvpx/README_MOZILLA
+++ b/media/libvpx/README_MOZILLA
@@ -3,9 +3,9 @@ git repository using the update.py scrip
 made were those applied by update.py and the addition of
 moz.build and Makefile.in build files for the
 Mozilla build system.
 
 The libvpx git repository is:
 
     https://chromium.googlesource.com/webm/libvpx
 
-The git commit ID used was v1.6.0
+The git commit ID used was v1.6.1
--- a/media/libvpx/bug1137614.patch
+++ b/media/libvpx/bug1137614.patch
@@ -1,23 +1,23 @@
 diff --git a/media/libvpx/libvpx/vp8/encoder/block.h b/media/libvpx/libvpx/vp8/encoder/block.h
 --- a/media/libvpx/libvpx/vp8/encoder/block.h
 +++ b/media/libvpx/libvpx/vp8/encoder/block.h
-@@ -93,17 +93,18 @@ typedef struct macroblock
-     int rddiv;
-     int rdmult;
-     unsigned int * mb_activity_ptr;
-     int * mb_norm_activity_ptr;
-     signed int act_zbin_adj;
-     signed int last_act_zbin_adj;
- 
-     int *mvcost[2];
--    int *mvsadcost[2];
-+    /* MSVC generates code that thinks this is 16-byte aligned */
-+    DECLARE_ALIGNED(16, int*, mvsadcost[2]);
-     int (*mbmode_cost)[MB_MODE_COUNT];
-     int (*intra_uv_mode_cost)[MB_MODE_COUNT];
-     int (*bmode_costs)[10][10];
-     int *inter_bmode_costs;
-     int (*token_costs)[COEF_BANDS][PREV_COEF_CONTEXTS]
-     [MAX_ENTROPY_TOKENS];
- 
-     /* These define limits to motion vector components to prevent
+@@ -87,17 +87,18 @@ typedef struct macroblock {
+   int rddiv;
+   int rdmult;
+   unsigned int *mb_activity_ptr;
+   int *mb_norm_activity_ptr;
+   signed int act_zbin_adj;
+   signed int last_act_zbin_adj;
+
+   int *mvcost[2];
+-  int *mvsadcost[2];
++  /* MSVC generates code that thinks this is 16-byte aligned */
++  DECLARE_ALIGNED(16, int*, mvsadcost[2]);
+   int (*mbmode_cost)[MB_MODE_COUNT];
+   int (*intra_uv_mode_cost)[MB_MODE_COUNT];
+   int (*bmode_costs)[10][10];
+   int *inter_bmode_costs;
+   int (*token_costs)[COEF_BANDS][PREV_COEF_CONTEXTS][MAX_ENTROPY_TOKENS];
+
+   /* These define limits to motion vector components to prevent
+    * them from extending outside the UMV borders.
deleted file mode 100644
--- a/media/libvpx/clang-cl.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Bug 1233983 - Make libvpx build with clang-cl
-
-diff --git a/media/libvpx/libvpx/vp8/common/generic/systemdependent.c b/media/libvpx/libvpx/vp8/common/generic/systemdependent.c
-index 4393ced..8ee7e02 100644
---- a/media/libvpx/libvpx/vp8/common/generic/systemdependent.c
-+++ b/media/libvpx/libvpx/vp8/common/generic/systemdependent.c
-@@ -24,6 +24,7 @@
- #include <unistd.h>
- #elif defined(_WIN32)
- #include <windows.h>
-+#include <intrin.h>
- typedef void (WINAPI *PGNSI)(LPSYSTEM_INFO);
- #elif defined(__OS2__)
- #define INCL_DOS
-diff --git a/media/libvpx/libvpx/vp8/common/rtcd.c b/media/libvpx/libvpx/vp8/common/rtcd.c
-index ab0e9b4..98c2ecd 100644
---- a/media/libvpx/libvpx/vp8/common/rtcd.c
-+++ b/media/libvpx/libvpx/vp8/common/rtcd.c
-@@ -11,6 +11,9 @@
- #define RTCD_C
- #include "./vp8_rtcd.h"
- #include "vpx_ports/vpx_once.h"
-+#ifdef _MSC_VER
-+#include <intrin.h>
-+#endif
- 
- 
- void vp8_rtcd()
-diff --git a/media/libvpx/libvpx/vp8/decoder/threading.c b/media/libvpx/libvpx/vp8/decoder/threading.c
-index 6801532..a76672f 100644
---- a/media/libvpx/libvpx/vp8/decoder/threading.c
-+++ b/media/libvpx/libvpx/vp8/decoder/threading.c
-@@ -29,6 +29,9 @@
- #if CONFIG_ERROR_CONCEALMENT
- #include "error_concealment.h"
- #endif
-+#ifdef _MSC_VER
-+#include <intrin.h>
-+#endif
- 
- #define CALLOC_ARRAY(p, n) CHECK_MEM_ERROR((p), vpx_calloc(sizeof(*(p)), (n)))
- #define CALLOC_ARRAY_ALIGNED(p, n, algn) do {                      \
-diff --git a/media/libvpx/libvpx/vp8/encoder/encodeframe.c b/media/libvpx/libvpx/vp8/encoder/encodeframe.c
-index d381d8d..5e84fb4 100644
---- a/media/libvpx/libvpx/vp8/encoder/encodeframe.c
-+++ b/media/libvpx/libvpx/vp8/encoder/encodeframe.c
-@@ -34,6 +34,9 @@
- #include "bitstream.h"
- #endif
- #include "encodeframe.h"
-+#ifdef _MSC_VER
-+#include <intrin.h>
-+#endif
- 
- extern void vp8_stuff_mb(VP8_COMP *cpi, MACROBLOCK *x, TOKENEXTRA **t) ;
- extern void vp8_calc_ref_frame_costs(int *ref_frame_cost,
-diff --git a/media/libvpx/libvpx/vp8/encoder/ethreading.c b/media/libvpx/libvpx/vp8/encoder/ethreading.c
-index 4e234cc..519ae73b 100644
---- a/media/libvpx/libvpx/vp8/encoder/ethreading.c
-+++ b/media/libvpx/libvpx/vp8/encoder/ethreading.c
-@@ -14,6 +14,9 @@
- #include "vp8/common/extend.h"
- #include "bitstream.h"
- #include "encodeframe.h"
-+#ifdef _MSC_VER
-+#include <intrin.h>
-+#endif
- 
- #if CONFIG_MULTITHREAD
- 
-diff --git a/media/libvpx/libvpx/vpx_dsp/vpx_dsp_rtcd.c b/media/libvpx/libvpx/vpx_dsp/vpx_dsp_rtcd.c
-index 5fe27b6..d247603 100644
---- a/media/libvpx/libvpx/vpx_dsp/vpx_dsp_rtcd.c
-+++ b/media/libvpx/libvpx/vpx_dsp/vpx_dsp_rtcd.c
-@@ -11,6 +11,9 @@
- #define RTCD_C
- #include "./vpx_dsp_rtcd.h"
- #include "vpx_ports/vpx_once.h"
-+#ifdef _MSC_VER
-+#include <intrin.h>
-+#endif
- 
- void vpx_dsp_rtcd() {
-   once(setup_rtcd_internal);
-diff --git a/media/libvpx/libvpx/vpx_scale/vpx_scale_rtcd.c b/media/libvpx/libvpx/vpx_scale/vpx_scale_rtcd.c
-index bea603f..65532ba 100644
---- a/media/libvpx/libvpx/vpx_scale/vpx_scale_rtcd.c
-+++ b/media/libvpx/libvpx/vpx_scale/vpx_scale_rtcd.c
-@@ -11,6 +11,9 @@
- #define RTCD_C
- #include "./vpx_scale_rtcd.h"
- #include "vpx_ports/vpx_once.h"
-+#ifdef _MSC_VER
-+#include <intrin.h>
-+#endif
- 
- void vpx_scale_rtcd()
- {
--- a/media/libvpx/config/generic/vp8_rtcd.h
+++ b/media/libvpx/config/generic/vp8_rtcd.h
@@ -36,19 +36,16 @@ void vp8_bilinear_predict8x4_c(unsigned 
 #define vp8_bilinear_predict8x4 vp8_bilinear_predict8x4_c
 
 void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 #define vp8_bilinear_predict8x8 vp8_bilinear_predict8x8_c
 
 int vp8_block_error_c(short *coeff, short *dqcoeff);
 #define vp8_block_error vp8_block_error_c
 
-void vp8_clear_system_state_c();
-#define vp8_clear_system_state vp8_clear_system_state_c
-
 void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 #define vp8_copy_mem16x16 vp8_copy_mem16x16_c
 
 void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 #define vp8_copy_mem8x4 vp8_copy_mem8x4_c
 
 void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 #define vp8_copy_mem8x8 vp8_copy_mem8x8_c
--- a/media/libvpx/config/generic/vp9_rtcd.h
+++ b/media/libvpx/config/generic/vp9_rtcd.h
@@ -54,20 +54,20 @@ int vp9_full_search_sad_c(const struct m
 #define vp9_full_search_sad vp9_full_search_sad_c
 
 void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
 #define vp9_fwht4x4 vp9_fwht4x4_c
 
 void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
 #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c
 
-void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
 #define vp9_iht4x4_16_add vp9_iht4x4_16_add_c
 
-void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
 #define vp9_iht8x8_64_add vp9_iht8x8_64_add_c
 
 void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 #define vp9_quantize_fp vp9_quantize_fp_c
 
 void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c
 
--- a/media/libvpx/config/generic/vpx_config.asm
+++ b/media/libvpx/config/generic/vpx_config.asm
@@ -1,17 +1,15 @@
 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.equ DO1STROUNDING, 0
 .equ ARCH_ARM ,  0
 .equ ARCH_MIPS ,  0
 .equ ARCH_X86 ,  0
 .equ ARCH_X86_64 ,  0
-.equ HAVE_EDSP ,  0
-.equ HAVE_MEDIA ,  0
 .equ HAVE_NEON ,  0
 .equ HAVE_NEON_ASM ,  0
 .equ HAVE_MIPS32 ,  0
 .equ HAVE_DSPR2 ,  0
 .equ HAVE_MSA ,  0
 .equ HAVE_MIPS64 ,  0
 .equ HAVE_MMX ,  0
 .equ HAVE_SSE ,  0
@@ -24,17 +22,16 @@
 .equ HAVE_VPX_PORTS ,  1
 .equ HAVE_PTHREAD_H ,  1
 .equ CONFIG_DEPENDENCY_TRACKING ,  1
 .equ CONFIG_EXTERNAL_BUILD ,  1
 .equ CONFIG_INSTALL_DOCS ,  0
 .equ CONFIG_INSTALL_BINS ,  1
 .equ CONFIG_INSTALL_LIBS ,  1
 .equ CONFIG_INSTALL_SRCS ,  0
-.equ CONFIG_USE_X86INC ,  0
 .equ CONFIG_DEBUG ,  0
 .equ CONFIG_GPROF ,  0
 .equ CONFIG_GCOV ,  0
 .equ CONFIG_RVCT ,  0
 .equ CONFIG_GCC ,  1
 .equ CONFIG_MSVS ,  0
 .equ CONFIG_PIC ,  1
 .equ CONFIG_BIG_ENDIAN ,  0
--- a/media/libvpx/config/generic/vpx_config.h
+++ b/media/libvpx/config/generic/vpx_config.h
@@ -9,18 +9,16 @@
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
 #define ARCH_ARM 0
 #define ARCH_MIPS 0
 #define ARCH_X86 0
 #define ARCH_X86_64 0
-#define HAVE_EDSP 0
-#define HAVE_MEDIA 0
 #define HAVE_NEON 0
 #define HAVE_NEON_ASM 0
 #define HAVE_MIPS32 0
 #define HAVE_DSPR2 0
 #define HAVE_MSA 0
 #define HAVE_MIPS64 0
 #define HAVE_MMX 0
 #define HAVE_SSE 0
@@ -33,17 +31,16 @@
 #define HAVE_VPX_PORTS 1
 #define HAVE_PTHREAD_H 1
 #define CONFIG_DEPENDENCY_TRACKING 1
 #define CONFIG_EXTERNAL_BUILD 1
 #define CONFIG_INSTALL_DOCS 0
 #define CONFIG_INSTALL_BINS 1
 #define CONFIG_INSTALL_LIBS 1
 #define CONFIG_INSTALL_SRCS 0
-#define CONFIG_USE_X86INC 0
 #define CONFIG_DEBUG 0
 #define CONFIG_GPROF 0
 #define CONFIG_GCOV 0
 #define CONFIG_RVCT 0
 #define CONFIG_GCC 1
 #define CONFIG_MSVS 0
 #define CONFIG_PIC 1
 #define CONFIG_BIG_ENDIAN 0
--- a/media/libvpx/config/generic/vpx_dsp_rtcd.h
+++ b/media/libvpx/config/generic/vpx_dsp_rtcd.h
@@ -266,82 +266,82 @@ void vpx_hadamard_16x16_c(const int16_t 
 #define vpx_hadamard_16x16 vpx_hadamard_16x16_c
 
 void vpx_hadamard_8x8_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
 #define vpx_hadamard_8x8 vpx_hadamard_8x8_c
 
 void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c
 
-void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct16x16_10_add vpx_idct16x16_10_add_c
 
-void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct16x16_1_add vpx_idct16x16_1_add_c
 
-void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct16x16_256_add vpx_idct16x16_256_add_c
 
-void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct32x32_1024_add vpx_idct32x32_1024_add_c
 
-void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct32x32_135_add vpx_idct32x32_135_add_c
 
-void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct32x32_1_add vpx_idct32x32_1_add_c
 
-void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct32x32_34_add vpx_idct32x32_34_add_c
 
-void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct4x4_16_add vpx_idct4x4_16_add_c
 
-void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct4x4_1_add vpx_idct4x4_1_add_c
 
-void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct8x8_12_add vpx_idct8x8_12_add_c
 
-void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct8x8_1_add vpx_idct8x8_1_add_c
 
-void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_idct8x8_64_add vpx_idct8x8_64_add_c
 
 int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width);
 #define vpx_int_pro_col vpx_int_pro_col_c
 
 void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height);
 #define vpx_int_pro_row vpx_int_pro_row_c
 
-void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c
 
-void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c
 
+void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define vpx_lpf_horizontal_16 vpx_lpf_horizontal_16_c
+
+void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+#define vpx_lpf_horizontal_16_dual vpx_lpf_horizontal_16_dual_c
+
 void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 #define vpx_lpf_horizontal_4 vpx_lpf_horizontal_4_c
 
 void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 #define vpx_lpf_horizontal_4_dual vpx_lpf_horizontal_4_dual_c
 
 void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 #define vpx_lpf_horizontal_8 vpx_lpf_horizontal_8_c
 
 void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 #define vpx_lpf_horizontal_8_dual vpx_lpf_horizontal_8_dual_c
 
-void vpx_lpf_horizontal_edge_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-#define vpx_lpf_horizontal_edge_16 vpx_lpf_horizontal_edge_16_c
-
-void vpx_lpf_horizontal_edge_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-#define vpx_lpf_horizontal_edge_8 vpx_lpf_horizontal_edge_8_c
-
 void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 #define vpx_lpf_vertical_16 vpx_lpf_vertical_16_c
 
 void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 #define vpx_lpf_vertical_16_dual vpx_lpf_vertical_16_dual_c
 
 void vpx_lpf_vertical_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 #define vpx_lpf_vertical_4 vpx_lpf_vertical_4_c
@@ -638,16 +638,19 @@ uint32_t vpx_sub_pixel_variance8x4_c(con
 #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c
 
 uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 #define vpx_sub_pixel_variance8x8 vpx_sub_pixel_variance8x8_c
 
 void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
 #define vpx_subtract_block vpx_subtract_block_c
 
+uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size);
+#define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c
+
 void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_tm_predictor_16x16 vpx_tm_predictor_16x16_c
 
 void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_tm_predictor_32x32 vpx_tm_predictor_32x32_c
 
 void vpx_tm_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_tm_predictor_4x4 vpx_tm_predictor_4x4_c
@@ -701,25 +704,16 @@ unsigned int vpx_variance8x16_c(const ui
 #define vpx_variance8x16 vpx_variance8x16_c
 
 unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 #define vpx_variance8x4 vpx_variance8x4_c
 
 unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 #define vpx_variance8x8 vpx_variance8x8_c
 
-uint32_t vpx_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-#define vpx_variance_halfpixvar16x16_h vpx_variance_halfpixvar16x16_h_c
-
-uint32_t vpx_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-#define vpx_variance_halfpixvar16x16_hv vpx_variance_halfpixvar16x16_hv_c
-
-uint32_t vpx_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-#define vpx_variance_halfpixvar16x16_v vpx_variance_halfpixvar16x16_v_c
-
 void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c
 
 int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl);
 #define vpx_vector_var vpx_vector_var_c
 
 void vpx_dsp_rtcd(void);
 
--- a/media/libvpx/config/linux/arm/vp8_rtcd.h
+++ b/media/libvpx/config/linux/arm/vp8_rtcd.h
@@ -22,268 +22,242 @@ struct variance_vtable;
 union int_mv;
 struct yv12_buffer_config;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 void vp8_bilinear_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict16x16_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_bilinear_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_bilinear_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 void vp8_bilinear_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict4x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-#define vp8_bilinear_predict4x4 vp8_bilinear_predict4x4_armv6
+void vp8_bilinear_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_bilinear_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 void vp8_bilinear_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_bilinear_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_bilinear_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 void vp8_bilinear_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_bilinear_predict8x8_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_bilinear_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_bilinear_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 int vp8_block_error_c(short *coeff, short *dqcoeff);
 #define vp8_block_error vp8_block_error_c
 
-void vp8_clear_system_state_c();
-#define vp8_clear_system_state vp8_clear_system_state_c
-
 void vp8_copy_mem16x16_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem16x16_v6(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 void vp8_copy_mem16x16_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_copy_mem16x16)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 
 void vp8_copy_mem8x4_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem8x4_v6(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 void vp8_copy_mem8x4_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_copy_mem8x4)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 
 void vp8_copy_mem8x8_c(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
-void vp8_copy_mem8x8_v6(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 void vp8_copy_mem8x8_neon(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_copy_mem8x8)(unsigned char *src, int src_pitch, unsigned char *dst, int dst_pitch);
 
 void vp8_dc_only_idct_add_c(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
-void vp8_dc_only_idct_add_v6(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
 void vp8_dc_only_idct_add_neon(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
 RTCD_EXTERN void (*vp8_dc_only_idct_add)(short input, unsigned char *pred, int pred_stride, unsigned char *dst, int dst_stride);
 
 int vp8_denoiser_filter_c(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 int vp8_denoiser_filter_neon(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 RTCD_EXTERN int (*vp8_denoiser_filter)(unsigned char *mc_running_avg_y, int mc_avg_y_stride, unsigned char *running_avg_y, int avg_y_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 
 int vp8_denoiser_filter_uv_c(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 int vp8_denoiser_filter_uv_neon(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 RTCD_EXTERN int (*vp8_denoiser_filter_uv)(unsigned char *mc_running_avg, int mc_avg_stride, unsigned char *running_avg, int avg_stride, unsigned char *sig, int sig_stride, unsigned int motion_magnitude, int increase_denoising);
 
 void vp8_dequant_idct_add_c(short *input, short *dq, unsigned char *output, int stride);
-void vp8_dequant_idct_add_v6(short *input, short *dq, unsigned char *output, int stride);
 void vp8_dequant_idct_add_neon(short *input, short *dq, unsigned char *output, int stride);
 RTCD_EXTERN void (*vp8_dequant_idct_add)(short *input, short *dq, unsigned char *output, int stride);
 
 void vp8_dequant_idct_add_uv_block_c(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
-void vp8_dequant_idct_add_uv_block_v6(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
 void vp8_dequant_idct_add_uv_block_neon(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
 RTCD_EXTERN void (*vp8_dequant_idct_add_uv_block)(short *q, short *dq, unsigned char *dst_u, unsigned char *dst_v, int stride, char *eobs);
 
 void vp8_dequant_idct_add_y_block_c(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
-void vp8_dequant_idct_add_y_block_v6(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
 void vp8_dequant_idct_add_y_block_neon(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
 RTCD_EXTERN void (*vp8_dequant_idct_add_y_block)(short *q, short *dq, unsigned char *dst, int stride, char *eobs);
 
 void vp8_dequantize_b_c(struct blockd*, short *dqc);
-void vp8_dequantize_b_v6(struct blockd*, short *dqc);
 void vp8_dequantize_b_neon(struct blockd*, short *dqc);
 RTCD_EXTERN void (*vp8_dequantize_b)(struct blockd*, short *dqc);
 
 int vp8_diamond_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, union int_mv *best_mv, int search_param, int sad_per_bit, int *num00, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
 #define vp8_diamond_search_sad vp8_diamond_search_sad_c
 
 void vp8_fast_quantize_b_c(struct block *, struct blockd *);
 void vp8_fast_quantize_b_neon(struct block *, struct blockd *);
 RTCD_EXTERN void (*vp8_fast_quantize_b)(struct block *, struct blockd *);
 
 int vp8_full_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
 #define vp8_full_search_sad vp8_full_search_sad_c
 
 void vp8_loop_filter_bh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bh_armv6(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 void vp8_loop_filter_bh_neon(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 RTCD_EXTERN void (*vp8_loop_filter_bh)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 
 void vp8_loop_filter_bv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_bv_armv6(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 void vp8_loop_filter_bv_neon(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 RTCD_EXTERN void (*vp8_loop_filter_bv)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 
 void vp8_loop_filter_mbh_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbh_armv6(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 void vp8_loop_filter_mbh_neon(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 RTCD_EXTERN void (*vp8_loop_filter_mbh)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 
 void vp8_loop_filter_mbv_c(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
-void vp8_loop_filter_mbv_armv6(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 void vp8_loop_filter_mbv_neon(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 RTCD_EXTERN void (*vp8_loop_filter_mbv)(unsigned char *y, unsigned char *u, unsigned char *v, int ystride, int uv_stride, struct loop_filter_info *lfi);
 
 void vp8_loop_filter_bhs_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bhs_armv6(unsigned char *y, int ystride, const unsigned char *blimit);
 void vp8_loop_filter_bhs_neon(unsigned char *y, int ystride, const unsigned char *blimit);
 RTCD_EXTERN void (*vp8_loop_filter_simple_bh)(unsigned char *y, int ystride, const unsigned char *blimit);
 
 void vp8_loop_filter_bvs_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_bvs_armv6(unsigned char *y, int ystride, const unsigned char *blimit);
 void vp8_loop_filter_bvs_neon(unsigned char *y, int ystride, const unsigned char *blimit);
 RTCD_EXTERN void (*vp8_loop_filter_simple_bv)(unsigned char *y, int ystride, const unsigned char *blimit);
 
 void vp8_loop_filter_simple_horizontal_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_horizontal_edge_armv6(unsigned char *y, int ystride, const unsigned char *blimit);
 void vp8_loop_filter_mbhs_neon(unsigned char *y, int ystride, const unsigned char *blimit);
 RTCD_EXTERN void (*vp8_loop_filter_simple_mbh)(unsigned char *y, int ystride, const unsigned char *blimit);
 
 void vp8_loop_filter_simple_vertical_edge_c(unsigned char *y, int ystride, const unsigned char *blimit);
-void vp8_loop_filter_simple_vertical_edge_armv6(unsigned char *y, int ystride, const unsigned char *blimit);
 void vp8_loop_filter_mbvs_neon(unsigned char *y, int ystride, const unsigned char *blimit);
 RTCD_EXTERN void (*vp8_loop_filter_simple_mbv)(unsigned char *y, int ystride, const unsigned char *blimit);
 
 int vp8_mbblock_error_c(struct macroblock *mb, int dc);
 #define vp8_mbblock_error vp8_mbblock_error_c
 
 int vp8_mbuverror_c(struct macroblock *mb);
 #define vp8_mbuverror vp8_mbuverror_c
 
 int vp8_refining_search_sad_c(struct macroblock *x, struct block *b, struct blockd *d, union int_mv *ref_mv, int sad_per_bit, int distance, struct variance_vtable *fn_ptr, int *mvcost[2], union int_mv *center_mv);
 #define vp8_refining_search_sad vp8_refining_search_sad_c
 
 void vp8_regular_quantize_b_c(struct block *, struct blockd *);
 #define vp8_regular_quantize_b vp8_regular_quantize_b_c
 
 void vp8_short_fdct4x4_c(short *input, short *output, int pitch);
-void vp8_short_fdct4x4_armv6(short *input, short *output, int pitch);
 void vp8_short_fdct4x4_neon(short *input, short *output, int pitch);
 RTCD_EXTERN void (*vp8_short_fdct4x4)(short *input, short *output, int pitch);
 
 void vp8_short_fdct8x4_c(short *input, short *output, int pitch);
-void vp8_short_fdct8x4_armv6(short *input, short *output, int pitch);
 void vp8_short_fdct8x4_neon(short *input, short *output, int pitch);
 RTCD_EXTERN void (*vp8_short_fdct8x4)(short *input, short *output, int pitch);
 
 void vp8_short_idct4x4llm_c(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
-void vp8_short_idct4x4llm_v6_dual(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
 void vp8_short_idct4x4llm_neon(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
 RTCD_EXTERN void (*vp8_short_idct4x4llm)(short *input, unsigned char *pred, int pitch, unsigned char *dst, int dst_stride);
 
 void vp8_short_inv_walsh4x4_c(short *input, short *output);
-void vp8_short_inv_walsh4x4_v6(short *input, short *output);
 void vp8_short_inv_walsh4x4_neon(short *input, short *output);
 RTCD_EXTERN void (*vp8_short_inv_walsh4x4)(short *input, short *output);
 
 void vp8_short_inv_walsh4x4_1_c(short *input, short *output);
 #define vp8_short_inv_walsh4x4_1 vp8_short_inv_walsh4x4_1_c
 
 void vp8_short_walsh4x4_c(short *input, short *output, int pitch);
-void vp8_short_walsh4x4_armv6(short *input, short *output, int pitch);
 void vp8_short_walsh4x4_neon(short *input, short *output, int pitch);
 RTCD_EXTERN void (*vp8_short_walsh4x4)(short *input, short *output, int pitch);
 
 void vp8_sixtap_predict16x16_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict16x16_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_sixtap_predict16x16_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_sixtap_predict16x16)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 void vp8_sixtap_predict4x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict4x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-#define vp8_sixtap_predict4x4 vp8_sixtap_predict4x4_armv6
+void vp8_sixtap_predict4x4_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
+RTCD_EXTERN void (*vp8_sixtap_predict4x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 void vp8_sixtap_predict8x4_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x4_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_sixtap_predict8x4_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_sixtap_predict8x4)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 void vp8_sixtap_predict8x8_c(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
-void vp8_sixtap_predict8x8_armv6(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 void vp8_sixtap_predict8x8_neon(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 RTCD_EXTERN void (*vp8_sixtap_predict8x8)(unsigned char *src, int src_pitch, int xofst, int yofst, unsigned char *dst, int dst_pitch);
 
 void vp8_rtcd(void);
 
 #include "vpx_config.h"
 
 #ifdef RTCD_C
 #include "vpx_ports/arm.h"
 static void setup_rtcd_internal(void)
 {
     int flags = arm_cpu_caps();
 
     (void)flags;
 
-    vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_armv6;
+    vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_c;
     if (flags & HAS_NEON) vp8_bilinear_predict16x16 = vp8_bilinear_predict16x16_neon;
-    vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_armv6;
+    vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_c;
+    if (flags & HAS_NEON) vp8_bilinear_predict4x4 = vp8_bilinear_predict4x4_neon;
+    vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_c;
     if (flags & HAS_NEON) vp8_bilinear_predict8x4 = vp8_bilinear_predict8x4_neon;
-    vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_armv6;
+    vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_c;
     if (flags & HAS_NEON) vp8_bilinear_predict8x8 = vp8_bilinear_predict8x8_neon;
-    vp8_copy_mem16x16 = vp8_copy_mem16x16_v6;
+    vp8_copy_mem16x16 = vp8_copy_mem16x16_c;
     if (flags & HAS_NEON) vp8_copy_mem16x16 = vp8_copy_mem16x16_neon;
-    vp8_copy_mem8x4 = vp8_copy_mem8x4_v6;
+    vp8_copy_mem8x4 = vp8_copy_mem8x4_c;
     if (flags & HAS_NEON) vp8_copy_mem8x4 = vp8_copy_mem8x4_neon;
-    vp8_copy_mem8x8 = vp8_copy_mem8x8_v6;
+    vp8_copy_mem8x8 = vp8_copy_mem8x8_c;
     if (flags & HAS_NEON) vp8_copy_mem8x8 = vp8_copy_mem8x8_neon;
-    vp8_dc_only_idct_add = vp8_dc_only_idct_add_v6;
+    vp8_dc_only_idct_add = vp8_dc_only_idct_add_c;
     if (flags & HAS_NEON) vp8_dc_only_idct_add = vp8_dc_only_idct_add_neon;
     vp8_denoiser_filter = vp8_denoiser_filter_c;
     if (flags & HAS_NEON) vp8_denoiser_filter = vp8_denoiser_filter_neon;
     vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_c;
     if (flags & HAS_NEON) vp8_denoiser_filter_uv = vp8_denoiser_filter_uv_neon;
-    vp8_dequant_idct_add = vp8_dequant_idct_add_v6;
+    vp8_dequant_idct_add = vp8_dequant_idct_add_c;
     if (flags & HAS_NEON) vp8_dequant_idct_add = vp8_dequant_idct_add_neon;
-    vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_v6;
+    vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_c;
     if (flags & HAS_NEON) vp8_dequant_idct_add_uv_block = vp8_dequant_idct_add_uv_block_neon;
-    vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_v6;
+    vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_c;
     if (flags & HAS_NEON) vp8_dequant_idct_add_y_block = vp8_dequant_idct_add_y_block_neon;
-    vp8_dequantize_b = vp8_dequantize_b_v6;
+    vp8_dequantize_b = vp8_dequantize_b_c;
     if (flags & HAS_NEON) vp8_dequantize_b = vp8_dequantize_b_neon;
     vp8_fast_quantize_b = vp8_fast_quantize_b_c;
     if (flags & HAS_NEON) vp8_fast_quantize_b = vp8_fast_quantize_b_neon;
-    vp8_loop_filter_bh = vp8_loop_filter_bh_armv6;
+    vp8_loop_filter_bh = vp8_loop_filter_bh_c;
     if (flags & HAS_NEON) vp8_loop_filter_bh = vp8_loop_filter_bh_neon;
-    vp8_loop_filter_bv = vp8_loop_filter_bv_armv6;
+    vp8_loop_filter_bv = vp8_loop_filter_bv_c;
     if (flags & HAS_NEON) vp8_loop_filter_bv = vp8_loop_filter_bv_neon;
-    vp8_loop_filter_mbh = vp8_loop_filter_mbh_armv6;
+    vp8_loop_filter_mbh = vp8_loop_filter_mbh_c;
     if (flags & HAS_NEON) vp8_loop_filter_mbh = vp8_loop_filter_mbh_neon;
-    vp8_loop_filter_mbv = vp8_loop_filter_mbv_armv6;
+    vp8_loop_filter_mbv = vp8_loop_filter_mbv_c;
     if (flags & HAS_NEON) vp8_loop_filter_mbv = vp8_loop_filter_mbv_neon;
-    vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_armv6;
+    vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_c;
     if (flags & HAS_NEON) vp8_loop_filter_simple_bh = vp8_loop_filter_bhs_neon;
-    vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_armv6;
+    vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_c;
     if (flags & HAS_NEON) vp8_loop_filter_simple_bv = vp8_loop_filter_bvs_neon;
-    vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_armv6;
+    vp8_loop_filter_simple_mbh = vp8_loop_filter_simple_horizontal_edge_c;
     if (flags & HAS_NEON) vp8_loop_filter_simple_mbh = vp8_loop_filter_mbhs_neon;
-    vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_armv6;
+    vp8_loop_filter_simple_mbv = vp8_loop_filter_simple_vertical_edge_c;
     if (flags & HAS_NEON) vp8_loop_filter_simple_mbv = vp8_loop_filter_mbvs_neon;
-    vp8_short_fdct4x4 = vp8_short_fdct4x4_armv6;
+    vp8_short_fdct4x4 = vp8_short_fdct4x4_c;
     if (flags & HAS_NEON) vp8_short_fdct4x4 = vp8_short_fdct4x4_neon;
-    vp8_short_fdct8x4 = vp8_short_fdct8x4_armv6;
+    vp8_short_fdct8x4 = vp8_short_fdct8x4_c;
     if (flags & HAS_NEON) vp8_short_fdct8x4 = vp8_short_fdct8x4_neon;
-    vp8_short_idct4x4llm = vp8_short_idct4x4llm_v6_dual;
+    vp8_short_idct4x4llm = vp8_short_idct4x4llm_c;
     if (flags & HAS_NEON) vp8_short_idct4x4llm = vp8_short_idct4x4llm_neon;
-    vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_v6;
+    vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_c;
     if (flags & HAS_NEON) vp8_short_inv_walsh4x4 = vp8_short_inv_walsh4x4_neon;
-    vp8_short_walsh4x4 = vp8_short_walsh4x4_armv6;
+    vp8_short_walsh4x4 = vp8_short_walsh4x4_c;
     if (flags & HAS_NEON) vp8_short_walsh4x4 = vp8_short_walsh4x4_neon;
-    vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_armv6;
+    vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_c;
     if (flags & HAS_NEON) vp8_sixtap_predict16x16 = vp8_sixtap_predict16x16_neon;
-    vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_armv6;
+    vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_c;
+    if (flags & HAS_NEON) vp8_sixtap_predict4x4 = vp8_sixtap_predict4x4_neon;
+    vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_c;
     if (flags & HAS_NEON) vp8_sixtap_predict8x4 = vp8_sixtap_predict8x4_neon;
-    vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_armv6;
+    vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_c;
     if (flags & HAS_NEON) vp8_sixtap_predict8x8 = vp8_sixtap_predict8x8_neon;
 }
 #endif
 
 #ifdef __cplusplus
 }  // extern "C"
 #endif
 
--- a/media/libvpx/config/linux/arm/vp9_rtcd.h
+++ b/media/libvpx/config/linux/arm/vp9_rtcd.h
@@ -56,23 +56,23 @@ int vp9_full_search_sad_c(const struct m
 #define vp9_full_search_sad vp9_full_search_sad_c
 
 void vp9_fwht4x4_c(const int16_t *input, tran_low_t *output, int stride);
 #define vp9_fwht4x4 vp9_fwht4x4_c
 
 void vp9_iht16x16_256_add_c(const tran_low_t *input, uint8_t *output, int pitch, int tx_type);
 #define vp9_iht16x16_256_add vp9_iht16x16_256_add_c
 
-void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-void vp9_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
+void vp9_iht4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
+RTCD_EXTERN void (*vp9_iht4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
 
-void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-void vp9_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
-RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride, int tx_type);
+void vp9_iht8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
+void vp9_iht8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
+RTCD_EXTERN void (*vp9_iht8x8_64_add)(const tran_low_t *input, uint8_t *dest, int stride, int tx_type);
 
 void vp9_quantize_fp_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 void vp9_quantize_fp_neon(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 RTCD_EXTERN void (*vp9_quantize_fp)(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 
 void vp9_quantize_fp_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 #define vp9_quantize_fp_32x32 vp9_quantize_fp_32x32_c
 
--- a/media/libvpx/config/linux/arm/vpx_config.asm
+++ b/media/libvpx/config/linux/arm/vpx_config.asm
@@ -1,17 +1,15 @@
 @ This file was created from a .asm file
 @  using the ads2gas.pl script.
 	.equ DO1STROUNDING, 0
 .equ ARCH_ARM ,  1
 .equ ARCH_MIPS ,  0
 .equ ARCH_X86 ,  0
 .equ ARCH_X86_64 ,  0
-.equ HAVE_EDSP ,  0
-.equ HAVE_MEDIA ,  1
 .equ HAVE_NEON ,  1
 .equ HAVE_NEON_ASM ,  1
 .equ HAVE_MIPS32 ,  0
 .equ HAVE_DSPR2 ,  0
 .equ HAVE_MSA ,  0
 .equ HAVE_MIPS64 ,  0
 .equ HAVE_MMX ,  0
 .equ HAVE_SSE ,  0
@@ -24,17 +22,16 @@
 .equ HAVE_VPX_PORTS ,  1
 .equ HAVE_PTHREAD_H ,  1
 .equ CONFIG_DEPENDENCY_TRACKING ,  1
 .equ CONFIG_EXTERNAL_BUILD ,  1
 .equ CONFIG_INSTALL_DOCS ,  0
 .equ CONFIG_INSTALL_BINS ,  1
 .equ CONFIG_INSTALL_LIBS ,  1
 .equ CONFIG_INSTALL_SRCS ,  0
-.equ CONFIG_USE_X86INC ,  0
 .equ CONFIG_DEBUG ,  0
 .equ CONFIG_GPROF ,  0
 .equ CONFIG_GCOV ,  0
 .equ CONFIG_RVCT ,  0
 .equ CONFIG_GCC ,  1
 .equ CONFIG_MSVS ,  0
 .equ CONFIG_PIC ,  1
 .equ CONFIG_BIG_ENDIAN ,  0
--- a/media/libvpx/config/linux/arm/vpx_config.h
+++ b/media/libvpx/config/linux/arm/vpx_config.h
@@ -9,18 +9,16 @@
 #ifndef VPX_CONFIG_H
 #define VPX_CONFIG_H
 #define RESTRICT    
 #define INLINE      inline
 #define ARCH_ARM 1
 #define ARCH_MIPS 0
 #define ARCH_X86 0
 #define ARCH_X86_64 0
-#define HAVE_EDSP 0
-#define HAVE_MEDIA 1
 #define HAVE_NEON 1
 #define HAVE_NEON_ASM 1
 #define HAVE_MIPS32 0
 #define HAVE_DSPR2 0
 #define HAVE_MSA 0
 #define HAVE_MIPS64 0
 #define HAVE_MMX 0
 #define HAVE_SSE 0
@@ -33,17 +31,16 @@
 #define HAVE_VPX_PORTS 1
 #define HAVE_PTHREAD_H 1
 #define CONFIG_DEPENDENCY_TRACKING 1
 #define CONFIG_EXTERNAL_BUILD 1
 #define CONFIG_INSTALL_DOCS 0
 #define CONFIG_INSTALL_BINS 1
 #define CONFIG_INSTALL_LIBS 1
 #define CONFIG_INSTALL_SRCS 0
-#define CONFIG_USE_X86INC 0
 #define CONFIG_DEBUG 0
 #define CONFIG_GPROF 0
 #define CONFIG_GCOV 0
 #define CONFIG_RVCT 0
 #define CONFIG_GCC 1
 #define CONFIG_MSVS 0
 #define CONFIG_PIC 1
 #define CONFIG_BIG_ENDIAN 0
--- a/media/libvpx/config/linux/arm/vpx_dsp_rtcd.h
+++ b/media/libvpx/config/linux/arm/vpx_dsp_rtcd.h
@@ -70,27 +70,30 @@ void vpx_d117_predictor_32x32_c(uint8_t 
 
 void vpx_d117_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_d117_predictor_4x4 vpx_d117_predictor_4x4_c
 
 void vpx_d117_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_d117_predictor_8x8 vpx_d117_predictor_8x8_c
 
 void vpx_d135_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vpx_d135_predictor_16x16 vpx_d135_predictor_16x16_c
+void vpx_d135_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vpx_d135_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_d135_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vpx_d135_predictor_32x32 vpx_d135_predictor_32x32_c
+void vpx_d135_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vpx_d135_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_d135_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 void vpx_d135_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_d135_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_d135_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vpx_d135_predictor_8x8 vpx_d135_predictor_8x8_c
+void vpx_d135_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vpx_d135_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_d153_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_d153_predictor_16x16 vpx_d153_predictor_16x16_c
 
 void vpx_d153_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_d153_predictor_32x32 vpx_d153_predictor_32x32_c
 
 void vpx_d153_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
@@ -123,17 +126,18 @@ void vpx_d207e_predictor_4x4_c(uint8_t *
 void vpx_d207e_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_d207e_predictor_8x8 vpx_d207e_predictor_8x8_c
 
 void vpx_d45_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 void vpx_d45_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_d45_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_d45_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
-#define vpx_d45_predictor_32x32 vpx_d45_predictor_32x32_c
+void vpx_d45_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
+RTCD_EXTERN void (*vpx_d45_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_d45_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 void vpx_d45_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_d45_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_d45_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 void vpx_d45_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_d45_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
@@ -307,102 +311,102 @@ RTCD_EXTERN void (*vpx_hadamard_16x16)(c
 
 void vpx_hadamard_8x8_c(const int16_t *src_diff, int src_stride, int16_t *coeff);
 void vpx_hadamard_8x8_neon(const int16_t *src_diff, int src_stride, int16_t *coeff);
 RTCD_EXTERN void (*vpx_hadamard_8x8)(const int16_t *src_diff, int src_stride, int16_t *coeff);
 
 void vpx_he_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_he_predictor_4x4 vpx_he_predictor_4x4_c
 
-void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct16x16_10_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct16x16_10_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct16x16_10_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct16x16_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct16x16_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct16x16_1_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct16x16_256_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct16x16_256_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct16x16_256_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_1024_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct32x32_1024_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_135_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct32x32_135_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct32x32_135_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct32x32_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct32x32_1_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct32x32_1024_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct32x32_34_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct32x32_34_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct32x32_34_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct4x4_16_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct4x4_16_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct4x4_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct4x4_1_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct8x8_12_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct8x8_12_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct8x8_12_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct8x8_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct8x8_1_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct8x8_1_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
-void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
-void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int dest_stride);
-RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_idct8x8_64_add_c(const tran_low_t *input, uint8_t *dest, int stride);
+void vpx_idct8x8_64_add_neon(const tran_low_t *input, uint8_t *dest, int stride);
+RTCD_EXTERN void (*vpx_idct8x8_64_add)(const tran_low_t *input, uint8_t *dest, int stride);
 
 int16_t vpx_int_pro_col_c(const uint8_t *ref, const int width);
 int16_t vpx_int_pro_col_neon(const uint8_t *ref, const int width);
 RTCD_EXTERN int16_t (*vpx_int_pro_col)(const uint8_t *ref, const int width);
 
 void vpx_int_pro_row_c(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height);
 void vpx_int_pro_row_neon(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height);
 RTCD_EXTERN void (*vpx_int_pro_row)(int16_t *hbuf, const uint8_t *ref, const int ref_stride, const int height);
 
-void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_iwht4x4_16_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_iwht4x4_16_add vpx_iwht4x4_16_add_c
 
-void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int dest_stride);
+void vpx_iwht4x4_1_add_c(const tran_low_t *input, uint8_t *dest, int stride);
 #define vpx_iwht4x4_1_add vpx_iwht4x4_1_add_c
 
+void vpx_lpf_horizontal_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+void vpx_lpf_horizontal_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+RTCD_EXTERN void (*vpx_lpf_horizontal_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+
+void vpx_lpf_horizontal_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+void vpx_lpf_horizontal_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+RTCD_EXTERN void (*vpx_lpf_horizontal_16_dual)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
+
 void vpx_lpf_horizontal_4_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 void vpx_lpf_horizontal_4_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 RTCD_EXTERN void (*vpx_lpf_horizontal_4)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 
 void vpx_lpf_horizontal_4_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 void vpx_lpf_horizontal_4_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 RTCD_EXTERN void (*vpx_lpf_horizontal_4_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 
 void vpx_lpf_horizontal_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 void vpx_lpf_horizontal_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 RTCD_EXTERN void (*vpx_lpf_horizontal_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 
 void vpx_lpf_horizontal_8_dual_c(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 void vpx_lpf_horizontal_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 RTCD_EXTERN void (*vpx_lpf_horizontal_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 
-void vpx_lpf_horizontal_edge_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-void vpx_lpf_horizontal_edge_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-RTCD_EXTERN void (*vpx_lpf_horizontal_edge_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-
-void vpx_lpf_horizontal_edge_8_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-void vpx_lpf_horizontal_edge_8_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-RTCD_EXTERN void (*vpx_lpf_horizontal_edge_8)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
-
 void vpx_lpf_vertical_16_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 void vpx_lpf_vertical_16_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 RTCD_EXTERN void (*vpx_lpf_vertical_16)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 
 void vpx_lpf_vertical_16_dual_c(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 void vpx_lpf_vertical_16_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 RTCD_EXTERN void (*vpx_lpf_vertical_16_dual)(uint8_t *s, int pitch, const uint8_t *blimit, const uint8_t *limit, const uint8_t *thresh);
 
@@ -422,17 +426,16 @@ void vpx_lpf_vertical_8_dual_c(uint8_t *
 void vpx_lpf_vertical_8_dual_neon(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 RTCD_EXTERN void (*vpx_lpf_vertical_8_dual)(uint8_t *s, int pitch, const uint8_t *blimit0, const uint8_t *limit0, const uint8_t *thresh0, const uint8_t *blimit1, const uint8_t *limit1, const uint8_t *thresh1);
 
 void vpx_minmax_8x8_c(const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max);
 void vpx_minmax_8x8_neon(const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max);
 RTCD_EXTERN void (*vpx_minmax_8x8)(const uint8_t *s, int p, const uint8_t *d, int dp, int *min, int *max);
 
 unsigned int vpx_mse16x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
-unsigned int vpx_mse16x16_media(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
 unsigned int vpx_mse16x16_neon(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
 RTCD_EXTERN unsigned int (*vpx_mse16x16)(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
 
 unsigned int vpx_mse16x8_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
 #define vpx_mse16x8 vpx_mse16x8_c
 
 unsigned int vpx_mse8x16_c(const uint8_t *src_ptr, int  source_stride, const uint8_t *ref_ptr, int  recon_stride, unsigned int *sse);
 #define vpx_mse8x16 vpx_mse8x16_c
@@ -442,17 +445,16 @@ unsigned int vpx_mse8x8_c(const uint8_t 
 
 void vpx_quantize_b_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 #define vpx_quantize_b vpx_quantize_b_c
 
 void vpx_quantize_b_32x32_c(const tran_low_t *coeff_ptr, intptr_t n_coeffs, int skip_block, const int16_t *zbin_ptr, const int16_t *round_ptr, const int16_t *quant_ptr, const int16_t *quant_shift_ptr, tran_low_t *qcoeff_ptr, tran_low_t *dqcoeff_ptr, const int16_t *dequant_ptr, uint16_t *eob_ptr, const int16_t *scan, const int16_t *iscan);
 #define vpx_quantize_b_32x32 vpx_quantize_b_32x32_c
 
 unsigned int vpx_sad16x16_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
-unsigned int vpx_sad16x16_media(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 unsigned int vpx_sad16x16_neon(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 RTCD_EXTERN unsigned int (*vpx_sad16x16)(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride);
 
 unsigned int vpx_sad16x16_avg_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, const uint8_t *second_pred);
 #define vpx_sad16x16_avg vpx_sad16x16_avg_c
 
 void vpx_sad16x16x3_c(const uint8_t *src_ptr, int src_stride, const uint8_t *ref_ptr, int ref_stride, uint32_t *sad_array);
 #define vpx_sad16x16x3 vpx_sad16x16x3_c
@@ -679,17 +681,16 @@ uint32_t vpx_sub_pixel_avg_variance8x16_
 
 uint32_t vpx_sub_pixel_avg_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 #define vpx_sub_pixel_avg_variance8x4 vpx_sub_pixel_avg_variance8x4_c
 
 uint32_t vpx_sub_pixel_avg_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse, const uint8_t *second_pred);
 #define vpx_sub_pixel_avg_variance8x8 vpx_sub_pixel_avg_variance8x8_c
 
 uint32_t vpx_sub_pixel_variance16x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
-uint32_t vpx_sub_pixel_variance16x16_media(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 uint32_t vpx_sub_pixel_variance16x16_neon(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance16x16)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 
 uint32_t vpx_sub_pixel_variance16x32_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 #define vpx_sub_pixel_variance16x32 vpx_sub_pixel_variance16x32_c
 
 uint32_t vpx_sub_pixel_variance16x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 #define vpx_sub_pixel_variance16x8 vpx_sub_pixel_variance16x8_c
@@ -719,24 +720,26 @@ RTCD_EXTERN uint32_t (*vpx_sub_pixel_var
 
 uint32_t vpx_sub_pixel_variance8x16_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 #define vpx_sub_pixel_variance8x16 vpx_sub_pixel_variance8x16_c
 
 uint32_t vpx_sub_pixel_variance8x4_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 #define vpx_sub_pixel_variance8x4 vpx_sub_pixel_variance8x4_c
 
 uint32_t vpx_sub_pixel_variance8x8_c(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
-uint32_t vpx_sub_pixel_variance8x8_media(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 uint32_t vpx_sub_pixel_variance8x8_neon(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 RTCD_EXTERN uint32_t (*vpx_sub_pixel_variance8x8)(const uint8_t *src_ptr, int source_stride, int xoffset, int  yoffset, const uint8_t *ref_ptr, int ref_stride, uint32_t *sse);
 
 void vpx_subtract_block_c(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
 void vpx_subtract_block_neon(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
 RTCD_EXTERN void (*vpx_subtract_block)(int rows, int cols, int16_t *diff_ptr, ptrdiff_t diff_stride, const uint8_t *src_ptr, ptrdiff_t src_stride, const uint8_t *pred_ptr, ptrdiff_t pred_stride);
 
+uint64_t vpx_sum_squares_2d_i16_c(const int16_t *src, int stride, int size);
+#define vpx_sum_squares_2d_i16 vpx_sum_squares_2d_i16_c
+
 void vpx_tm_predictor_16x16_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 void vpx_tm_predictor_16x16_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_tm_predictor_16x16)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_tm_predictor_32x32_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 void vpx_tm_predictor_32x32_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_tm_predictor_32x32)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
@@ -760,17 +763,16 @@ void vpx_v_predictor_4x4_c(uint8_t *dst,
 void vpx_v_predictor_4x4_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_v_predictor_4x4)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 void vpx_v_predictor_8x8_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 void vpx_v_predictor_8x8_neon(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 RTCD_EXTERN void (*vpx_v_predictor_8x8)(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 
 unsigned int vpx_variance16x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vpx_variance16x16_media(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 unsigned int vpx_variance16x16_neon(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 RTCD_EXTERN unsigned int (*vpx_variance16x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 
 unsigned int vpx_variance16x32_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 #define vpx_variance16x32 vpx_variance16x32_c
 
 unsigned int vpx_variance16x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 unsigned int vpx_variance16x8_neon(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
@@ -804,32 +806,19 @@ RTCD_EXTERN unsigned int (*vpx_variance6
 unsigned int vpx_variance8x16_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 unsigned int vpx_variance8x16_neon(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 RTCD_EXTERN unsigned int (*vpx_variance8x16)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 
 unsigned int vpx_variance8x4_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 #define vpx_variance8x4 vpx_variance8x4_c
 
 unsigned int vpx_variance8x8_c(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
-unsigned int vpx_variance8x8_media(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 unsigned int vpx_variance8x8_neon(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 RTCD_EXTERN unsigned int (*vpx_variance8x8)(const uint8_t *src_ptr, int source_stride, const uint8_t *ref_ptr, int ref_stride, unsigned int *sse);
 
-uint32_t vpx_variance_halfpixvar16x16_h_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-uint32_t vpx_variance_halfpixvar16x16_h_media(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-#define vpx_variance_halfpixvar16x16_h vpx_variance_halfpixvar16x16_h_media
-
-uint32_t vpx_variance_halfpixvar16x16_hv_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-uint32_t vpx_variance_halfpixvar16x16_hv_media(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-#define vpx_variance_halfpixvar16x16_hv vpx_variance_halfpixvar16x16_hv_media
-
-uint32_t vpx_variance_halfpixvar16x16_v_c(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-uint32_t vpx_variance_halfpixvar16x16_v_media(const unsigned char *src_ptr, int source_stride, const unsigned char *ref_ptr, int  ref_stride, uint32_t *sse);
-#define vpx_variance_halfpixvar16x16_v vpx_variance_halfpixvar16x16_v_media
-
 void vpx_ve_predictor_4x4_c(uint8_t *dst, ptrdiff_t y_stride, const uint8_t *above, const uint8_t *left);
 #define vpx_ve_predictor_4x4 vpx_ve_predictor_4x4_c
 
 int vpx_vector_var_c(const int16_t *ref, const int16_t *src, const int bwl);
 int vpx_vector_var_neon(const int16_t *ref, const int16_t *src, const int bwl);
 RTCD_EXTERN int (*vpx_vector_var)(const int16_t *ref, const int16_t *src, const int bwl);
 
 void vpx_dsp_rtcd(void);
@@ -859,20 +848,28 @@ static void setup_rtcd_internal(void)
     vpx_convolve8_horiz = vpx_convolve8_horiz_c;
     if (flags & HAS_NEON) vpx_convolve8_horiz = vpx_convolve8_horiz_neon;
     vpx_convolve8_vert = vpx_convolve8_vert_c;
     if (flags & HAS_NEON) vpx_convolve8_vert = vpx_convolve8_vert_neon;
     vpx_convolve_avg = vpx_convolve_avg_c;
     if (flags & HAS_NEON) vpx_convolve_avg = vpx_convolve_avg_neon;
     vpx_convolve_copy = vpx_convolve_copy_c;
     if (flags & HAS_NEON) vpx_convolve_copy = vpx_convolve_copy_neon;
+    vpx_d135_predictor_16x16 = vpx_d135_predictor_16x16_c;
+    if (flags & HAS_NEON) vpx_d135_predictor_16x16 = vpx_d135_predictor_16x16_neon;
+    vpx_d135_predictor_32x32 = vpx_d135_predictor_32x32_c;
+    if (flags & HAS_NEON) vpx_d135_predictor_32x32 = vpx_d135_predictor_32x32_neon;
     vpx_d135_predictor_4x4 = vpx_d135_predictor_4x4_c;
     if (flags & HAS_NEON) vpx_d135_predictor_4x4 = vpx_d135_predictor_4x4_neon;
+    vpx_d135_predictor_8x8 = vpx_d135_predictor_8x8_c;
+    if (flags & HAS_NEON) vpx_d135_predictor_8x8 = vpx_d135_predictor_8x8_neon;
     vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_c;
     if (flags & HAS_NEON) vpx_d45_predictor_16x16 = vpx_d45_predictor_16x16_neon;
+    vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_c;
+    if (flags & HAS_NEON) vpx_d45_predictor_32x32 = vpx_d45_predictor_32x32_neon;
     vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_c;
     if (flags & HAS_NEON) vpx_d45_predictor_4x4 = vpx_d45_predictor_4x4_neon;
     vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_c;
     if (flags & HAS_NEON) vpx_d45_predictor_8x8 = vpx_d45_predictor_8x8_neon;
     vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_c;
     if (flags & HAS_NEON) vpx_dc_128_predictor_16x16 = vpx_dc_128_predictor_16x16_neon;
     vpx_dc_128_predictor_32x32 = vpx_dc_128_predictor_32x32_c;
     if (flags & HAS_NEON) vpx_dc_128_predictor_32x32 = vpx_dc_128_predictor_32x32_neon;
@@ -930,64 +927,64 @@ static void setup_rtcd_internal(void)
     if (flags & HAS_NEON) vpx_idct16x16_10_add = vpx_idct16x16_10_add_neon;
     vpx_idct16x16_1_add = vpx_idct16x16_1_add_c;
     if (flags & HAS_NEON) vpx_idct16x16_1_add = vpx_idct16x16_1_add_neon;
     vpx_idct16x16_256_add = vpx_idct16x16_256_add_c;
     if (flags & HAS_NEON) vpx_idct16x16_256_add = vpx_idct16x16_256_add_neon;
     vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_c;
     if (flags & HAS_NEON) vpx_idct32x32_1024_add = vpx_idct32x32_1024_add_neon;
     vpx_idct32x32_135_add = vpx_idct32x32_135_add_c;
-    if (flags & HAS_NEON) vpx_idct32x32_135_add = vpx_idct32x32_1024_add_neon;
+    if (flags & HAS_NEON) vpx_idct32x32_135_add = vpx_idct32x32_135_add_neon;
     vpx_idct32x32_1_add = vpx_idct32x32_1_add_c;
     if (flags & HAS_NEON) vpx_idct32x32_1_add = vpx_idct32x32_1_add_neon;
     vpx_idct32x32_34_add = vpx_idct32x32_34_add_c;
-    if (flags & HAS_NEON) vpx_idct32x32_34_add = vpx_idct32x32_1024_add_neon;
+    if (flags & HAS_NEON) vpx_idct32x32_34_add = vpx_idct32x32_34_add_neon;
     vpx_idct4x4_16_add = vpx_idct4x4_16_add_c;
     if (flags & HAS_NEON) vpx_idct4x4_16_add = vpx_idct4x4_16_add_neon;
     vpx_idct4x4_1_add = vpx_idct4x4_1_add_c;
     if (flags & HAS_NEON) vpx_idct4x4_1_add = vpx_idct4x4_1_add_neon;
     vpx_idct8x8_12_add = vpx_idct8x8_12_add_c;
     if (flags & HAS_NEON) vpx_idct8x8_12_add = vpx_idct8x8_12_add_neon;
     vpx_idct8x8_1_add = vpx_idct8x8_1_add_c;
     if (flags & HAS_NEON) vpx_idct8x8_1_add = vpx_idct8x8_1_add_neon;
     vpx_idct8x8_64_add = vpx_idct8x8_64_add_c;
     if (flags & HAS_NEON) vpx_idct8x8_64_add = vpx_idct8x8_64_add_neon;
     vpx_int_pro_col = vpx_int_pro_col_c;
     if (flags & HAS_NEON) vpx_int_pro_col = vpx_int_pro_col_neon;
     vpx_int_pro_row = vpx_int_pro_row_c;
     if (flags & HAS_NEON) vpx_int_pro_row = vpx_int_pro_row_neon;
+    vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_c;
+    if (flags & HAS_NEON) vpx_lpf_horizontal_16 = vpx_lpf_horizontal_16_neon;
+    vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_c;
+    if (flags & HAS_NEON) vpx_lpf_horizontal_16_dual = vpx_lpf_horizontal_16_dual_neon;
     vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_c;
     if (flags & HAS_NEON) vpx_lpf_horizontal_4 = vpx_lpf_horizontal_4_neon;
     vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_c;
     if (flags & HAS_NEON) vpx_lpf_horizontal_4_dual = vpx_lpf_horizontal_4_dual_neon;
     vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_c;
     if (flags & HAS_NEON) vpx_lpf_horizontal_8 = vpx_lpf_horizontal_8_neon;
     vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_c;
     if (flags & HAS_NEON) vpx_lpf_horizontal_8_dual = vpx_lpf_horizontal_8_dual_neon;
-    vpx_lpf_horizontal_edge_16 = vpx_lpf_horizontal_edge_16_c;
-    if (flags & HAS_NEON) vpx_lpf_horizontal_edge_16 = vpx_lpf_horizontal_edge_16_neon;
-    vpx_lpf_horizontal_edge_8 = vpx_lpf_horizontal_edge_8_c;
-    if (flags & HAS_NEON) vpx_lpf_horizontal_edge_8 = vpx_lpf_horizontal_edge_8_neon;
     vpx_lpf_vertical_16 = vpx_lpf_vertical_16_c;
     if (flags & HAS_NEON) vpx_lpf_vertical_16 = vpx_lpf_vertical_16_neon;
     vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_c;
     if (flags & HAS_NEON) vpx_lpf_vertical_16_dual = vpx_lpf_vertical_16_dual_neon;
     vpx_lpf_vertical_4 = vpx_lpf_vertical_4_c;
     if (flags & HAS_NEON) vpx_lpf_vertical_4 = vpx_lpf_vertical_4_neon;
     vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_c;
     if (flags & HAS_NEON) vpx_lpf_vertical_4_dual = vpx_lpf_vertical_4_dual_neon;
     vpx_lpf_vertical_8 = vpx_lpf_vertical_8_c;
     if (flags & HAS_NEON) vpx_lpf_vertical_8 = vpx_lpf_vertical_8_neon;
     vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_c;
     if (flags & HAS_NEON) vpx_lpf_vertical_8_dual = vpx_lpf_vertical_8_dual_neon;
     vpx_minmax_8x8 = vpx_minmax_8x8_c;
     if (flags & HAS_NEON) vpx_minmax_8x8 = vpx_minmax_8x8_neon;
-    vpx_mse16x16 = vpx_mse16x16_media;
+    vpx_mse16x16 = vpx_mse16x16_c;
     if (flags & HAS_NEON) vpx_mse16x16 = vpx_mse16x16_neon;
-    vpx_sad16x16 = vpx_sad16x16_media;
+    vpx_sad16x16 = vpx_sad16x16_c;
     if (flags & HAS_NEON) vpx_sad16x16 = vpx_sad16x16_neon;
     vpx_sad16x16x4d = vpx_sad16x16x4d_c;
     if (flags & HAS_NEON) vpx_sad16x16x4d = vpx_sad16x16x4d_neon;
     vpx_sad16x8 = vpx_sad16x8_c;
     if (flags & HAS_NEON) vpx_sad16x8 = vpx_sad16x8_neon;
     vpx_sad32x32 = vpx_sad32x32_c;
     if (flags & HAS_NEON) vpx_sad32x32 = vpx_sad32x32_neon;
     vpx_sad32x32x4d = vpx_sad32x32x4d_c;
@@ -999,23 +996,23 @@ static void setup_rtcd_internal(void)
     vpx_sad64x64x4d = vpx_sad64x64x4d_c;
     if (flags & HAS_NEON) vpx_sad64x64x4d = vpx_sad64x64x4d_neon;
     vpx_sad8x16 = vpx_sad8x16_c;
     if (flags & HAS_NEON) vpx_sad8x16 = vpx_sad8x16_neon;
     vpx_sad8x8 = vpx_sad8x8_c;
     if (flags & HAS_NEON) vpx_sad8x8 = vpx_sad8x8_neon;
     vpx_satd = vpx_satd_c;
     if (flags & HAS_NEON) vpx_satd = vpx_satd_neon;
-    vpx_sub_pixel_variance16x16 = vpx_sub_pixel_variance16x16_media;
+    vpx_sub_pixel_variance16x16 = vpx_sub_pixel_variance16x16_c;
     if (flags & HAS_NEON) vpx_sub_pixel_variance16x16 = vpx_sub_pixel_variance16x16_neon;
     vpx_sub_pixel_variance32x32 = vpx_sub_pixel_variance32x32_c;
     if (flags & HAS_NEON) vpx_sub_pixel_variance32x32 = vpx_sub_pixel_variance32x32_neon;
     vpx_sub_pixel_variance64x64 = vpx_sub_pixel_variance64x64_c;
     if (flags & HAS_NEON) vpx_sub_pixel_variance64x64 = vpx_sub_pixel_variance64x64_neon;
-    vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_media;
+    vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_c;
     if (flags & HAS_NEON) vpx_sub_pixel_variance8x8 = vpx_sub_pixel_variance8x8_neon;
     vpx_subtract_block = vpx_subtract_block_c;
     if (flags & HAS_NEON) vpx_subtract_block = vpx_subtract_block_neon;
     vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_c;
     if (flags & HAS_NEON) vpx_tm_predictor_16x16 = vpx_tm_predictor_16x16_neon;
     vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_c;
     if (flags & HAS_NEON) vpx_tm_predictor_32x32 = vpx_tm_predictor_32x32_neon;
     vpx_tm_predictor_4x4 = vpx_tm_predictor_4x4_c;
@@ -1025,31 +1022,31 @@ static void setup_rtcd_internal(void)
     vpx_v_predictor_16x16 = vpx_v_predictor_16x16_c;
     if (flags & HAS_NEON) vpx_v_predictor_16x16 = vpx_v_predictor_16x16_neon;
     vpx_v_predictor_32x32 = vpx_v_predictor_32x32_c;
     if (flags & HAS_NEON) vpx_v_predictor_32x32 = vpx_v_predictor_32x32_neon;
     vpx_v_predictor_4x4 = vpx_v_predictor_4x4_c;
     if (flags & HAS_NEON) vpx_v_predictor_4x4 = vpx_v_predictor_4x4_neon;
     vpx_v_predictor_8x8 = vpx_v_predictor_8x8_c;
     if (flags & HAS_NEON) vpx_v_predictor_8x8 = vpx_v_predictor_8x8_neon;
-    vpx_variance16x16 = vpx_variance16x16_media;
+    vpx_variance16x16 = vpx_variance16x16_c;
     if (flags & HAS_NEON) vpx_variance16x16 = vpx_variance16x16_neon;
     vpx_variance16x8 = vpx_va