summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorhui su <huisu@google.com>2015-08-24 13:46:05 -0700
committerhui su <huisu@google.com>2015-08-24 13:46:05 -0700
commitd88ca3c3354aa58e487683cd8736322a4e814d1c (patch)
treefbec19406aedc566c94afcef1c868f268c5363e0
parentf1d090e2f56e28b3218fb99f648bd5d59ae2f4b1 (diff)
downloadlibvpx-d88ca3c3354aa58e487683cd8736322a4e814d1c.tar
libvpx-d88ca3c3354aa58e487683cd8736322a4e814d1c.tar.gz
libvpx-d88ca3c3354aa58e487683cd8736322a4e814d1c.tar.bz2
libvpx-d88ca3c3354aa58e487683cd8736322a4e814d1c.zip
Fix a bug induced in f1d090e2f56e28b3218fb99f648bd5d59ae2f4b1
Change-Id: I5f7ab8ee75192a4c6c7aa723d2e113400d6ca9a5
-rw-r--r--vp10/decoder/decodeframe.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/vp10/decoder/decodeframe.c b/vp10/decoder/decodeframe.c
index 4d8ff5768..6cb2ff54c 100644
--- a/vp10/decoder/decodeframe.c
+++ b/vp10/decoder/decodeframe.c
@@ -217,7 +217,7 @@ static void inverse_transform_block_inter(MACROBLOCKD* xd, int plane,
return;
}
} else {
-#else // CONFIG_VP9_HIGHBITDEPTH
+#endif // CONFIG_VP9_HIGHBITDEPTH
switch (tx_size) {
case TX_4X4:
vp10_inv_txfm_add_4x4(dqcoeff, dst, stride, eob, tx_type,
@@ -237,7 +237,6 @@ static void inverse_transform_block_inter(MACROBLOCKD* xd, int plane,
assert(0 && "Invalid transform size");
return;
}
-#endif // CONFIG_VP9_HIGHBITDEPTH
#if CONFIG_VP9_HIGHBITDEPTH
}
#endif // CONFIG_VP9_HIGHBITDEPTH
@@ -289,7 +288,7 @@ static void inverse_transform_block_intra(MACROBLOCKD* xd, int plane,
return;
}
} else {
-#else // CONFIG_VP9_HIGHBITDEPTH
+#endif // CONFIG_VP9_HIGHBITDEPTH
switch (tx_size) {
case TX_4X4:
vp10_inv_txfm_add_4x4(dqcoeff, dst, stride, eob, tx_type,
@@ -309,7 +308,6 @@ static void inverse_transform_block_intra(MACROBLOCKD* xd, int plane,
assert(0 && "Invalid transform size");
return;
}
-#endif // CONFIG_VP9_HIGHBITDEPTH
#if CONFIG_VP9_HIGHBITDEPTH
}
#endif // CONFIG_VP9_HIGHBITDEPTH