commit 8aca36d36c47c61878414bcf8043aab02b73a10e
author Alex Converse <aconverse@google.com> Tue Jan 31 12:33:15 2017 -0800
committer Alex Converse <aconverse@google.com> Tue Jan 31 23:27:49 2017 +0000
tree fd376c8be0a43f59fe6baf8d1611d29b127c3cf0
parent 1da2edcd96713cfea48e7b52fe44e1f17e4a8d87

ans: Remove some out of date ifdefs

Change-Id: Ibd4bbceca8218eb94ed0af3c980f8e829a1896de

av1/decoder/decodeframe.c

diff --git a/av1/decoder/decodeframe.c b/av1/decoder/decodeframe.c
index 7bf419b..3345ba3 100644
--- a/av1/decoder/decodeframe.c
+++ b/av1/decoder/decodeframe.c
@@ -478,16 +478,9 @@
 }
 #endif
 
-static void predict_and_reconstruct_intra_block(AV1_COMMON *cm,
-                                                MACROBLOCKD *const xd,
-#if CONFIG_ANS
-                                                struct AnsDecoder *const r,
-#else
-                                                aom_reader *r,
-#endif  // CONFIG_ANS
-                                                MB_MODE_INFO *const mbmi,
-                                                int plane, int row, int col,
-                                                TX_SIZE tx_size) {
+static void predict_and_reconstruct_intra_block(
+    AV1_COMMON *cm, MACROBLOCKD *const xd, aom_reader *const r,
+    MB_MODE_INFO *const mbmi, int plane, int row, int col, TX_SIZE tx_size) {
   struct macroblockd_plane *const pd = &xd->plane[plane];
   PREDICTION_MODE mode = (plane == 0) ? mbmi->mode : mbmi->uv_mode;
   PLANE_TYPE plane_type = (plane == 0) ? PLANE_TYPE_Y : PLANE_TYPE_UV;
@@ -586,12 +579,8 @@
 #if !CONFIG_VAR_TX || CONFIG_SUPERTX || \
     (!CONFIG_VAR_TX && CONFIG_EXT_TX && CONFIG_RECT_TX)
 static int reconstruct_inter_block(AV1_COMMON *cm, MACROBLOCKD *const xd,
-#if CONFIG_ANS
-                                   struct AnsDecoder *const r,
-#else
-                                   aom_reader *r,
-#endif
-                                   int segment_id, int plane, int row, int col,
+                                   aom_reader *const r, int segment_id,
+                                   int plane, int row, int col,
                                    TX_SIZE tx_size) {
   PLANE_TYPE plane_type = (plane == 0) ? PLANE_TYPE_Y : PLANE_TYPE_UV;
   int block_idx = (row << 1) + col;