diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-18 06:04:57 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-18 06:04:57 -0500 |
| commit | 7369c7d7a5eed32963d8af37658286617919f91c (patch) | |
| tree | 5397ce7ee9bca1641118fdc3187bd9e2b24fdc9c /third_party/aom/aom_scale | |
| parent | 77887af9c4ad1420bbdb33984af4f74b55ca59db (diff) | |
| download | UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.gz UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.lz UXP-7369c7d7a5eed32963d8af37658286617919f91c.tar.xz UXP-7369c7d7a5eed32963d8af37658286617919f91c.zip | |
Update aom to commit id f5bdeac22930ff4c6b219be49c843db35970b918
Diffstat (limited to 'third_party/aom/aom_scale')
| -rw-r--r-- | third_party/aom/aom_scale/aom_scale.cmake | 4 | ||||
| -rw-r--r-- | third_party/aom/aom_scale/yv12config.h | 4 |
2 files changed, 6 insertions, 2 deletions
diff --git a/third_party/aom/aom_scale/aom_scale.cmake b/third_party/aom/aom_scale/aom_scale.cmake index e1e3f6cfb..b52fd83dc 100644 --- a/third_party/aom/aom_scale/aom_scale.cmake +++ b/third_party/aom/aom_scale/aom_scale.cmake @@ -26,11 +26,11 @@ set(AOM_SCALE_INTRIN_DSPR2 # target must exist before this function is called. function (setup_aom_scale_targets) add_library(aom_scale OBJECT ${AOM_SCALE_SOURCES}) - target_sources(aom PUBLIC $<TARGET_OBJECTS:aom_scale>) + target_sources(aom PRIVATE $<TARGET_OBJECTS:aom_scale>) if (HAVE_DSPR2) add_intrinsics_object_library("" "dspr2" "aom_scale" - "AOM_SCALE_INTRIN_DSPR2") + "AOM_SCALE_INTRIN_DSPR2" "aom_scale") endif () set(AOM_LIB_TARGETS ${AOM_LIB_TARGETS} aom_scale PARENT_SCOPE) diff --git a/third_party/aom/aom_scale/yv12config.h b/third_party/aom/aom_scale/yv12config.h index 434dc7b4a..76bfe9d7b 100644 --- a/third_party/aom/aom_scale/yv12config.h +++ b/third_party/aom/aom_scale/yv12config.h @@ -69,6 +69,10 @@ typedef struct yv12_buffer_config { int subsampling_y; unsigned int bit_depth; aom_color_space_t color_space; +#if CONFIG_COLORSPACE_HEADERS + aom_transfer_function_t transfer_function; + aom_chroma_sample_position_t chroma_sample_position; +#endif aom_color_range_t color_range; int render_width; int render_height; |