diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:00 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-19 23:05:03 -0500 |
| commit | d2499ead93dc4298c0882fe98902acb1b5209f99 (patch) | |
| tree | cb0b942aed59e5108f9a3e9d64e7b77854383421 /third_party/aom/tools | |
| parent | 41fbdea457bf50c0a43e1c27c5cbf7f0a3a9eb33 (diff) | |
| download | UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.gz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.lz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.tar.xz UXP-d2499ead93dc4298c0882fe98902acb1b5209f99.zip | |
Update libaom to commit ID 1e227d41f0616de9548a673a83a21ef990b62591
Diffstat (limited to 'third_party/aom/tools')
| -rw-r--r-- | third_party/aom/tools/obu_parser.cc | 3 | ||||
| -rw-r--r-- | third_party/aom/tools/obu_parser.h | 6 | ||||
| -rw-r--r-- | third_party/aom/tools/txfm_analyzer/txfm_graph.h | 6 |
3 files changed, 8 insertions, 7 deletions
diff --git a/third_party/aom/tools/obu_parser.cc b/third_party/aom/tools/obu_parser.cc index 2d0f5b27c..7d71386ce 100644 --- a/third_party/aom/tools/obu_parser.cc +++ b/third_party/aom/tools/obu_parser.cc @@ -8,6 +8,7 @@ * Media Patent License 1.0 was not distributed with this source code in the * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ +#include <string.h> #include <cstdio> #include <string> @@ -15,7 +16,7 @@ #include "aom/aom_codec.h" #include "aom/aom_integer.h" #include "aom_ports/mem_ops.h" -#include "av1/decoder/obu.h" +#include "av1/common/obu_util.h" #include "tools/obu_parser.h" namespace aom_tools { diff --git a/third_party/aom/tools/obu_parser.h b/third_party/aom/tools/obu_parser.h index 86e7c4581..1d7d2d794 100644 --- a/third_party/aom/tools/obu_parser.h +++ b/third_party/aom/tools/obu_parser.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef TOOLS_OBU_PARSER_H_ -#define TOOLS_OBU_PARSER_H_ +#ifndef AOM_TOOLS_OBU_PARSER_H_ +#define AOM_TOOLS_OBU_PARSER_H_ #include <cstdint> @@ -24,4 +24,4 @@ bool DumpObu(const uint8_t *data, int length, int *obu_overhead_bytes); } // namespace aom_tools -#endif // TOOLS_OBU_PARSER_H_ +#endif // AOM_TOOLS_OBU_PARSER_H_ diff --git a/third_party/aom/tools/txfm_analyzer/txfm_graph.h b/third_party/aom/tools/txfm_analyzer/txfm_graph.h index 76a9bc732..2e3c9551e 100644 --- a/third_party/aom/tools/txfm_analyzer/txfm_graph.h +++ b/third_party/aom/tools/txfm_analyzer/txfm_graph.h @@ -9,8 +9,8 @@ * PATENTS file, you can obtain it at www.aomedia.org/license/patent. */ -#ifndef TOOLS_TXFM_ANALYZER_H_ -#define TOOLS_TXFM_ANALYZER_H_ +#ifndef AOM_TOOLS_TXFM_ANALYZER_TXFM_GRAPH_H_ +#define AOM_TOOLS_TXFM_ANALYZER_TXFM_GRAPH_H_ struct Node { Node *inNode[2]; @@ -158,4 +158,4 @@ void amplify_value(Node *node, int stage_num, int node_num, int stage_idx, void propagate_estimate_amlify(Node *node, int stage_num, int node_num, int stage_idx, int amplify_bit, int estimate_bit); -#endif // TOOLS_TXFM_ANALYZER_H_ +#endif // AOM_TOOLS_TXFM_ANALYZER_TXFM_GRAPH_H_ |