commit 542aa3275722e01957d4d241e147e7a08d3b54bb
author Tom Finegan <tomfinegan@google.com> Wed Mar 14 18:03:17 2018 -0700
committer James Zern <jzern@google.com> Thu Mar 15 22:38:57 2018 +0000
tree 73b0a1909a5b19b97baa43036761a5d51273048a
parent e7302dc58facbeffad2cefe48d1f111610afdb9d

Fix experiment inconsistency in obu.c.

Make the ordering of the obu_frame and obu_redundant_frame_header
experiment preprocessor guards consistent.

Change-Id: I9711540de4f33b9325f492d4e32dbd64a6dc4fd7

av1/decoder/obu.c

diff --git a/av1/decoder/obu.c b/av1/decoder/obu.c
index 706bb61..04630ed 100644
--- a/av1/decoder/obu.c
+++ b/av1/decoder/obu.c
@@ -419,13 +419,13 @@
           decoded_payload_size = seq_header_size;
         }
         break;
-#if CONFIG_OBU_FRAME
-      case OBU_FRAME:
-#endif  // CONFIG_OBU_FRAME
+      case OBU_FRAME_HEADER:
 #if CONFIG_OBU_REDUNDANT_FRAME_HEADER
       case OBU_REDUNDANT_FRAME_HEADER:
 #endif  // CONFIG_OBU_REDUNDANT_FRAME_HEADER
-      case OBU_FRAME_HEADER:
+#if CONFIG_OBU_FRAME
+      case OBU_FRAME:
+#endif  // CONFIG_OBU_FRAME
         // Only decode first frame header received
         if (!frame_header_received) {
           frame_header_size =