commit e74bd079a8c9b70e88d4fba708bf77902184345c
author Urvang Joshi <urvang@google.com> Wed Oct 19 17:11:16 2016 -0700
committer Urvang Joshi <urvang@google.com> Thu Oct 20 15:34:25 2016 -0700
tree 2f3124d87565d4bc9bf3bba1f83b336a762e6706
parent f2753c34b67f061807b52114dd9fbf5514320d84

Palette+ext-intra bugfix: Read Intra angle info before palette info.

Note: Bug was only in aomedia codebase. webm/nextgenv2 branch is
correct.

Change-Id: Ie273a7286e3e1e6812f2a3570836eed4181dc4d7

av1/decoder/decodemv.c

diff --git a/av1/decoder/decodemv.c b/av1/decoder/decodemv.c
index d6d9a47..02e8945 100644
--- a/av1/decoder/decodemv.c
+++ b/av1/decoder/decodemv.c
@@ -540,7 +540,6 @@
 #if CONFIG_EXT_INTRA
   read_intra_angle_info(mbmi, r);
 #endif  // CONFIG_EXT_INTRA
-
 #if CONFIG_PALETTE
   mbmi->palette_mode_info.palette_size[0] = 0;
   mbmi->palette_mode_info.palette_size[1] = 0;
@@ -806,16 +805,15 @@
   }
 
   mbmi->uv_mode = read_intra_mode_uv(cm, xd, r, mbmi->mode);
+#if CONFIG_EXT_INTRA
+  read_intra_angle_info(mbmi, r);
+#endif  // CONFIG_EXT_INTRA
 #if CONFIG_PALETTE
   mbmi->palette_mode_info.palette_size[0] = 0;
   mbmi->palette_mode_info.palette_size[1] = 0;
   if (bsize >= BLOCK_8X8 && cm->allow_screen_content_tools)
     read_palette_mode_info(cm, xd, r);
 #endif  // CONFIG_PALETTE
-
-#if CONFIG_EXT_INTRA
-  read_intra_angle_info(mbmi, r);
-#endif  // CONFIG_EXT_INTRA
 }
 
 static INLINE int is_mv_valid(const MV *mv) {