Merge "Highbd fht4x4 SSE4.1 optimization for DCT_DCT mode - Setup function vp10_highb...

diff --cc vp10/common/vp10_rtcd_defs.pl
Simple merge

diff --cc vp10/encoder/hybrid_fwd_txfm.c
index 785fef08820fae1d9c842b22143e224d7913c92e,58eb7483acc9d182d96fc017069f129d1ea0249a..e9dd70be6051cc1d828a9a3cacfa1a6d86f5f4da
--- 1/vp10/encoder/hybrid_fwd_txfm.c
--- 2/vp10/encoder/hybrid_fwd_txfm.c
+++ b/vp10/encoder/hybrid_fwd_txfm.c
@@@ -213,14 -227,17 +215,14 @@@ void vp10_highbd_fwd_txfm_4x4(const int
      case FLIPADST_FLIPADST:
      case ADST_FLIPADST:
      case FLIPADST_ADST:
-       vp10_highbd_fht4x4(src_diff, coeff, diff_stride, tx_type);
+       vp10_highbd_fht4x4_c(src_diff, coeff, diff_stride, tx_type);
        break;
 -    case DST_DST:
 -    case DCT_DST:
 -    case DST_DCT:
 -    case DST_ADST:
 -    case ADST_DST:
 -    case DST_FLIPADST:
 -    case FLIPADST_DST:
 -    case H_DCT:
      case V_DCT:
 +    case H_DCT:
 +    case V_ADST:
 +    case H_ADST:
 +    case V_FLIPADST:
 +    case H_FLIPADST:
        vp10_highbd_fht4x4_c(src_diff, coeff, diff_stride, tx_type);
        break;
      case IDTX:

diff --cc vp10/vp10cx.mk
Simple merge