diff options
| author | John Koleszar <jkoleszar@google.com> | 2013-05-21 17:29:51 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2013-05-21 17:29:51 -0700 |
| commit | ddf13be8ef7a9ab4c3b151b68de56da5ed9a069a (patch) | |
| tree | 3dd0fdba23c7f693bf2f90073860cd9c4e732fc0 /vp9/common/vp9_blockd.h | |
| parent | 1f7d810a72a290f3c52e518a72e130d42e69f3e1 (diff) | |
| parent | 679e4abdd5f733ab544689ce210b42d37e7ce164 (diff) | |
| download | libvpx-ddf13be8ef7a9ab4c3b151b68de56da5ed9a069a.tar libvpx-ddf13be8ef7a9ab4c3b151b68de56da5ed9a069a.tar.gz libvpx-ddf13be8ef7a9ab4c3b151b68de56da5ed9a069a.tar.bz2 libvpx-ddf13be8ef7a9ab4c3b151b68de56da5ed9a069a.zip | |
Merge "Initial version of alpha channel support" into experimental
Diffstat (limited to 'vp9/common/vp9_blockd.h')
| -rw-r--r-- | vp9/common/vp9_blockd.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/vp9/common/vp9_blockd.h b/vp9/common/vp9_blockd.h index e795bbae7..71d1dd934 100644 --- a/vp9/common/vp9_blockd.h +++ b/vp9/common/vp9_blockd.h @@ -296,7 +296,11 @@ struct scale_factors { convolve_fn_t predict[2][2][2]; // horiz, vert, avg }; +#if CONFIG_ALPHA +enum { MAX_MB_PLANE = 4 }; +#else enum { MAX_MB_PLANE = 3 }; +#endif struct buf_2d { uint8_t *buf; |