diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-19 21:52:15 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-19 21:52:20 -0500 |
| commit | bbcc64772580c8a979288791afa02d30bc476d2e (patch) | |
| tree | 437ce94c3fdd7497508e5b55de06c6d011678597 /third_party/aom/av1/decoder/detokenize.h | |
| parent | 14805f6ddbfb173c327768fff9f81f40ce5e81b0 (diff) | |
| download | UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.gz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.lz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.tar.xz UXP-bbcc64772580c8a979288791afa02d30bc476d2e.zip | |
Update aom to v1.0.0
Update aom to commit id d14c5bb4f336ef1842046089849dee4a301fbbf0.
Diffstat (limited to 'third_party/aom/av1/decoder/detokenize.h')
| -rw-r--r-- | third_party/aom/av1/decoder/detokenize.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/third_party/aom/av1/decoder/detokenize.h b/third_party/aom/av1/decoder/detokenize.h index eb31d58c6..ec85bf7ea 100644 --- a/third_party/aom/av1/decoder/detokenize.h +++ b/third_party/aom/av1/decoder/detokenize.h @@ -12,10 +12,9 @@ #ifndef AV1_DECODER_DETOKENIZE_H_ #define AV1_DECODER_DETOKENIZE_H_ -#include "./aom_config.h" -#if !CONFIG_PVQ || CONFIG_VAR_TX +#include "config/aom_config.h" + #include "av1/common/scan.h" -#endif // !CONFIG_PVQ || CONFIG_VAR_TX #include "av1/decoder/decoder.h" #ifdef __cplusplus @@ -24,12 +23,6 @@ extern "C" { void av1_decode_palette_tokens(MACROBLOCKD *const xd, int plane, aom_reader *r); -#if !CONFIG_PVQ || CONFIG_VAR_TX -int av1_decode_block_tokens(AV1_COMMON *cm, MACROBLOCKD *const xd, int plane, - const SCAN_ORDER *sc, int x, int y, TX_SIZE tx_size, - TX_TYPE tx_type, int16_t *max_scan_line, - aom_reader *r, int seg_id); -#endif // !CONFIG_PVQ #ifdef __cplusplus } // extern "C" #endif |