diff options
Diffstat (limited to 'media/libaom/src/av1/common/scan.h')
| -rw-r--r-- | media/libaom/src/av1/common/scan.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/media/libaom/src/av1/common/scan.h b/media/libaom/src/av1/common/scan.h index 233dc0efa..d9620e1c5 100644 --- a/media/libaom/src/av1/common/scan.h +++ b/media/libaom/src/av1/common/scan.h @@ -15,9 +15,9 @@ #include "aom/aom_integer.h" #include "aom_ports/mem.h" -#include "av1/common/enums.h" -#include "av1/common/onyxc_int.h" +#include "av1/common/av1_common_int.h" #include "av1/common/blockd.h" +#include "av1/common/enums.h" #ifdef __cplusplus extern "C" { @@ -25,14 +25,14 @@ extern "C" { #define MAX_NEIGHBORS 2 -typedef enum SCAN_MODE { +enum { SCAN_MODE_ZIG_ZAG, SCAN_MODE_COL_DIAG, SCAN_MODE_ROW_DIAG, SCAN_MODE_COL_1D, SCAN_MODE_ROW_1D, SCAN_MODES -} SCAN_MODE; +} UENUM1BYTE(SCAN_MODE); extern const SCAN_ORDER av1_default_scan_orders[TX_SIZES]; extern const SCAN_ORDER av1_scan_orders[TX_SIZES_ALL][TX_TYPES]; |