diff options
| author | trav90 <travawine@palemoon.org> | 2018-10-19 23:00:02 -0500 |
|---|---|---|
| committer | trav90 <travawine@palemoon.org> | 2018-10-19 23:00:02 -0500 |
| commit | b8df135c97a854c2ff9b4394b016649c601177fa (patch) | |
| tree | 802b7de5ad245f1a12adbcef835ab0d0687c1bf8 /third_party/aom/aom_scale | |
| parent | a4d3c59dcac642f6b9557dc09b60eda40b517630 (diff) | |
| download | UXP-b8df135c97a854c2ff9b4394b016649c601177fa.tar UXP-b8df135c97a854c2ff9b4394b016649c601177fa.tar.gz UXP-b8df135c97a854c2ff9b4394b016649c601177fa.tar.lz UXP-b8df135c97a854c2ff9b4394b016649c601177fa.tar.xz UXP-b8df135c97a854c2ff9b4394b016649c601177fa.zip | |
Update libaom to rev b25610052a1398032320008d69b51d2da94f5928
Diffstat (limited to 'third_party/aom/aom_scale')
| -rw-r--r-- | third_party/aom/aom_scale/aom_scale_rtcd.c | 2 | ||||
| -rw-r--r-- | third_party/aom/aom_scale/generic/yv12config.c | 6 | ||||
| -rw-r--r-- | third_party/aom/aom_scale/yv12config.h | 2 |
3 files changed, 7 insertions, 3 deletions
diff --git a/third_party/aom/aom_scale/aom_scale_rtcd.c b/third_party/aom/aom_scale/aom_scale_rtcd.c index 08f1a376d..a04e053b0 100644 --- a/third_party/aom/aom_scale/aom_scale_rtcd.c +++ b/third_party/aom/aom_scale/aom_scale_rtcd.c @@ -15,4 +15,4 @@ #include "aom_ports/aom_once.h" -void aom_scale_rtcd() { once(setup_rtcd_internal); } +void aom_scale_rtcd() { aom_once(setup_rtcd_internal); } diff --git a/third_party/aom/aom_scale/generic/yv12config.c b/third_party/aom/aom_scale/generic/yv12config.c index cce915165..ca5b69066 100644 --- a/third_party/aom/aom_scale/generic/yv12config.c +++ b/third_party/aom/aom_scale/generic/yv12config.c @@ -51,6 +51,10 @@ int aom_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, aom_codec_frame_buffer_t *fb, aom_get_frame_buffer_cb_fn_t cb, void *cb_priv) { if (ybf) { +#if CONFIG_SIZE_LIMIT + if (width > DECODE_WIDTH_LIMIT || height > DECODE_HEIGHT_LIMIT) return -1; +#endif + const int aom_byte_align = (byte_alignment == 0) ? 1 : byte_alignment; const int aligned_width = (width + 7) & ~7; const int aligned_height = (height + 7) & ~7; @@ -154,7 +158,7 @@ int aom_realloc_frame_buffer(YV12_BUFFER_CONFIG *ybf, int width, int height, (uv_border_h * uv_stride) + uv_border_w, aom_byte_align); - ybf->use_external_refernce_buffers = 0; + ybf->use_external_reference_buffers = 0; if (use_highbitdepth) { if (ybf->y_buffer_8bit) aom_free(ybf->y_buffer_8bit); diff --git a/third_party/aom/aom_scale/yv12config.h b/third_party/aom/aom_scale/yv12config.h index 8f1c60069..2b4f597b0 100644 --- a/third_party/aom/aom_scale/yv12config.h +++ b/third_party/aom/aom_scale/yv12config.h @@ -81,7 +81,7 @@ typedef struct yv12_buffer_config { // Indicate whether y_buffer, u_buffer, and v_buffer points to the internally // allocated memory or external buffers. - int use_external_refernce_buffers; + int use_external_reference_buffers; // This is needed to store y_buffer, u_buffer, and v_buffer when set reference // uses an external refernece, and restore those buffer pointers after the // external reference frame is no longer used. |