From 4230c2306c194c058f56433a5275aa02a2e71d56 Mon Sep 17 00:00:00 2001 From: Peter de Rivaz Date: Wed, 22 Oct 2014 09:26:39 +0100 Subject: [PATCH] Fixed calling of highbd transform. This patch does not change behaviour because vp9_fwht4x4 is identical to vp9_highbd_fwht4x4, but it becomes important when accelerations are made to vp9_highbd_fwht4x4 in a later patch. Change-Id: I2b790316cdd498727c4951a9e591edb291de3ac8 --- vp9/encoder/vp9_encodeframe.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vp9/encoder/vp9_encodeframe.c b/vp9/encoder/vp9_encodeframe.c index 79946ca92..b323a8067 100644 --- a/vp9/encoder/vp9_encodeframe.c +++ b/vp9/encoder/vp9_encodeframe.c @@ -3414,9 +3414,9 @@ static void encode_frame_internal(VP9_COMP *cpi) { #if CONFIG_VP9_HIGHBITDEPTH if (cm->use_highbitdepth) - x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4; - else x->fwd_txm4x4 = xd->lossless ? vp9_highbd_fwht4x4 : vp9_highbd_fdct4x4; + else + x->fwd_txm4x4 = xd->lossless ? vp9_fwht4x4 : vp9_fdct4x4; x->highbd_itxm_add = xd->lossless ? vp9_highbd_iwht4x4_add : vp9_highbd_idct4x4_add; #else