diff options
| author | Joey Parrish <joeyparrish@google.com> | 2014-04-24 07:45:20 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@gerrit.golo.chromium.org> | 2014-04-24 07:45:20 -0700 |
| commit | 109f58acfd8d46deec1e0bd4d0f82daa36cd6b8e (patch) | |
| tree | 8ec8ba887aec90a218087311785b7c24d77d7501 /vp8/common/common.h | |
| parent | 025969d910c39ad43b95447efa2fdd46a335276a (diff) | |
| parent | 18c08607e0a216962fd3df4f7926ce288ee81b9b (diff) | |
| download | libvpx-109f58acfd8d46deec1e0bd4d0f82daa36cd6b8e.tar libvpx-109f58acfd8d46deec1e0bd4d0f82daa36cd6b8e.tar.gz libvpx-109f58acfd8d46deec1e0bd4d0f82daa36cd6b8e.tar.bz2 libvpx-109f58acfd8d46deec1e0bd4d0f82daa36cd6b8e.zip | |
Merge "Add VPXD_SET_DECRYPTOR support to the VP9 decoder."
Diffstat (limited to 'vp8/common/common.h')
| -rw-r--r-- | vp8/common/common.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/vp8/common/common.h b/vp8/common/common.h index ee5b58c75..17262d698 100644 --- a/vp8/common/common.h +++ b/vp8/common/common.h @@ -22,6 +22,9 @@ extern "C" { #endif +#define MIN(x, y) (((x) < (y)) ? (x) : (y)) +#define MAX(x, y) (((x) > (y)) ? (x) : (y)) + /* Only need this for fixed-size arrays, for structs just assign. */ #define vp8_copy( Dest, Src) { \ |