diff options
| author | Wen Chang Liu <wenchangliu@google.com> | 2022-05-12 08:42:51 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2022-05-12 08:42:51 +0000 |
| commit | e2bd023cf67c6ffbef640df9329b280a1e428843 (patch) | |
| tree | aa3177902465b79841ba8aff0d9b598eec563e3e | |
| parent | 044032e6b9257eafe4c8e0b9c85dc5656842a9fa (diff) | |
| parent | 0aad401478a87ecbc17ca57d70377717f0e3939f (diff) | |
| download | gchips-e2bd023cf67c6ffbef640df9329b280a1e428843.tar.gz | |
Merge "use UAPI for SBWC size macros from videodev2_exynos_media.h" into tm-d1-dev
| -rw-r--r-- | GrallocHAL/src/core/exynos_format_allocation.h | 4 | ||||
| -rw-r--r-- | gralloc4/src/core/exynos_format_allocation.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/GrallocHAL/src/core/exynos_format_allocation.h b/GrallocHAL/src/core/exynos_format_allocation.h index 30b2c15..204ed98 100644 --- a/GrallocHAL/src/core/exynos_format_allocation.h +++ b/GrallocHAL/src/core/exynos_format_allocation.h @@ -16,8 +16,8 @@ #pragma once -#if __has_include(<video/mfc_macros.h>) -#include <video/mfc_macros.h> +#if __has_include(<linux/videodev2_exynos_media.h>) +#include <linux/videodev2_exynos_media.h> #else #include "mfc_macros_local.h" #endif diff --git a/gralloc4/src/core/exynos_format_allocation.h b/gralloc4/src/core/exynos_format_allocation.h index bcaadfb..0abfbd0 100644 --- a/gralloc4/src/core/exynos_format_allocation.h +++ b/gralloc4/src/core/exynos_format_allocation.h @@ -16,8 +16,8 @@ #pragma once -#if __has_include(<video/mfc_macros.h>) -#include <video/mfc_macros.h> +#if __has_include(<linux/videodev2_exynos_media.h>) +#include <linux/videodev2_exynos_media.h> #else #include "mfc_macros_local.h" #endif |