diff options
| author | Erwin Jansen <jansene@google.com> | 2021-06-23 05:52:25 -0700 |
|---|---|---|
| committer | Erwin Jansen <jansene@google.com> | 2021-06-23 06:45:54 -0700 |
| commit | 16be34ae72cdb525c88c2b31b21b976f35fe36d8 (patch) | |
| tree | 6eacaffe4bebf8e00c290c1e1839e084b0c52e88 /third_party/libaom/source/libaom/aom/src/aom_image.c | |
| parent | 97e54a7e73c7b24e464ef06ef3c3b3716f21bb15 (diff) | |
| parent | 49cb4599560d6005d5df0dadfca2db04b288f216 (diff) | |
| download | webrtc-16be34ae72cdb525c88c2b31b21b976f35fe36d8.tar.gz | |
Merge upstream-master and enable ARM64
We bring in the latest WebRTC changes and turn on arm.
This adds a new third party lib: crc32c, and includes a workaround
for handling a depencency issue for arm.
Bug: 191745658
Change-Id: Ic5be99911990ef14a5f733f19394032b20f85024
Diffstat (limited to 'third_party/libaom/source/libaom/aom/src/aom_image.c')
| -rw-r--r-- | third_party/libaom/source/libaom/aom/src/aom_image.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/third_party/libaom/source/libaom/aom/src/aom_image.c b/third_party/libaom/source/libaom/aom/src/aom_image.c index dfdee87d26..13f71b2bf5 100644 --- a/third_party/libaom/source/libaom/aom/src/aom_image.c +++ b/third_party/libaom/source/libaom/aom/src/aom_image.c @@ -38,6 +38,8 @@ static aom_image_t *img_alloc_helper( unsigned int h, w, s, xcs, ycs, bps, bit_depth; unsigned int stride_in_bytes; + if (img != NULL) memset(img, 0, sizeof(aom_image_t)); + /* Treat align==0 like align==1 */ if (!buf_align) buf_align = 1; @@ -111,8 +113,6 @@ static aom_image_t *img_alloc_helper( if (!img) goto fail; img->self_allocd = 1; - } else { - memset(img, 0, sizeof(aom_image_t)); } img->img_data = img_data; |