commit a0c4578021c09ec89cfae04c514a806dac3aea0d
author Sarah Parker <sarahparker@google.com> Mon Mar 01 20:28:55 2021 -0800
committer Sarah Parker <sarahparker@google.com> Tue Mar 02 23:25:41 2021 +0000
tree f60ad50ff5370e1d3ddea72bd392c1d9c6be74e0
parent ca5281c4c58e0348e184e800897eb7de3cec41b8

Misc style fixes

In response to internal comments on libaom tree update

Change-Id: I6f983c4e73cae12876f4de4383dc4af6f3bc8596

av1/encoder/block.h

diff --git a/av1/encoder/block.h b/av1/encoder/block.h
index f72d11a..9993acb 100644
--- a/av1/encoder/block.h
+++ b/av1/encoder/block.h
@@ -487,8 +487,8 @@
  * - MB_RD_RECORD: records a whole *partition block*'s inter-mode txfm result.
  *   Since this operates on the partition block level, this can give us a
  *   whole txfm partition tree.
- * - TXB_RD_RECORD: records a txfm search result within a transform blcok
- *   itself. This operates on txb level only and onlyt appplies to square
+ * - TXB_RD_RECORD: records a txfm search result within a transform block
+ *   itself. This operates on txb level only and only appplies to square
  *   txfms.
  */
 typedef struct {

av1/encoder/txb_rdopt.h

diff --git a/av1/encoder/txb_rdopt.h b/av1/encoder/txb_rdopt.h
index 5209647..e86caaa 100644
--- a/av1/encoder/txb_rdopt.h
+++ b/av1/encoder/txb_rdopt.h
@@ -9,8 +9,8 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
-#ifndef AOM_AV1_ENCODER_OPTIMIZE_TXB_H_
-#define AOM_AV1_ENCODER_OPTIMIZE_TXB_H_
+#ifndef AOM_AV1_ENCODER_TXB_RDOPT_H_
+#define AOM_AV1_ENCODER_TXB_RDOPT_H_
 
 #include "av1/common/blockd.h"
 #include "av1/common/txb_common.h"
@@ -157,4 +157,4 @@
 }
 #endif
 
-#endif  // AOM_AV1_ENCODER_OPTIMIZE_TXB_H_
+#endif  // AOM_AV1_ENCODER_TXB_RDOPT_H_

av1/encoder/txb_rdopt_utils.h

diff --git a/av1/encoder/txb_rdopt_utils.h b/av1/encoder/txb_rdopt_utils.h
index 8cce290..9943026 100644
--- a/av1/encoder/txb_rdopt_utils.h
+++ b/av1/encoder/txb_rdopt_utils.h
@@ -9,6 +9,9 @@
  * PATENTS file, you can obtain it at www.aomedia.org/license/patent.
  */
 
+#ifndef AOM_AV1_ENCODER_TXB_RDOPT_UTILS_H_
+#define AOM_AV1_ENCODER_TXB_RDOPT_UTILS_H_
+
 #include "av1/encoder/encodetxb.h"
 
 static const int golomb_bits_cost[32] = {
@@ -219,3 +222,4 @@
 
   *eob = eob_out;
 }
+#endif  // AOM_AV1_ENCODER_TXB_RDOPT_UTILS_H_