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/decoder/error_concealment.c | |
| 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/decoder/error_concealment.c')
| -rw-r--r-- | vp8/decoder/error_concealment.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/vp8/decoder/error_concealment.c b/vp8/decoder/error_concealment.c index 0b58c98fd..4b304c83c 100644 --- a/vp8/decoder/error_concealment.c +++ b/vp8/decoder/error_concealment.c @@ -15,9 +15,7 @@ #include "decodemv.h" #include "vpx_mem/vpx_mem.h" #include "vp8/common/findnearmv.h" - -#define MIN(x,y) (((x)<(y))?(x):(y)) -#define MAX(x,y) (((x)>(y))?(x):(y)) +#include "vp8/common/common.h" #define FLOOR(x,q) ((x) & -(1 << (q))) |