diff options
| author | Joey Parrish <joeyparrish@google.com> | 2014-04-15 14:10:58 -0700 |
|---|---|---|
| committer | Joey Parrish <joeyparrish@google.com> | 2014-04-23 16:11:54 -0700 |
| commit | 18c08607e0a216962fd3df4f7926ce288ee81b9b (patch) | |
| tree | 471f1eafca2091dc47a18288b6999165d5ac2a7b /vp8/decoder/error_concealment.c | |
| parent | dddc3c6906f0d840935214ab0b26ea9a6e06cc27 (diff) | |
| download | libvpx-18c08607e0a216962fd3df4f7926ce288ee81b9b.tar libvpx-18c08607e0a216962fd3df4f7926ce288ee81b9b.tar.gz libvpx-18c08607e0a216962fd3df4f7926ce288ee81b9b.tar.bz2 libvpx-18c08607e0a216962fd3df4f7926ce288ee81b9b.zip | |
Add VPXD_SET_DECRYPTOR support to the VP9 decoder.
Change-Id: I88f86c8ff9af34e0b6531028b691921b54c2fc48
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))) |