Merge "Removing redefinition of ROUND_POWER_OF_TWO."

This commit is contained in:
Dmitry Kovalev 2014-02-27 13:43:31 -08:00 committed by Gerrit Code Review
commit c57fc4f38c

View File

@ -14,6 +14,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "vp9/common/vp9_common.h"
#include "vp9/encoder/vp9_resize.h"
@ -24,9 +25,6 @@
#define SUBPEL_MASK ((1 << SUBPEL_BITS) - 1)
#define INTERP_PRECISION_BITS 32
#define ROUND_POWER_OF_TWO(value, n) \
(((value) + (1 << ((n) - 1))) >> (n))
typedef int16_t interp_kernel[INTERP_TAPS];
// Filters for interpolation (0.5-band) - note this also filters integer pels.