diff options
| author | James Zern <jzern@google.com> | 2015-08-17 18:19:22 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-08-26 20:11:32 -0700 |
| commit | 5e16d397bd67b6d870c1ac34f50799f5c2fd6f91 (patch) | |
| tree | 1e31dcc55d3be8c0c98433d60a10c6b7c37dc28a /vp10/common/postproc.c | |
| parent | 205532f3a76752bec3a8b4d229c5fbf569b29922 (diff) | |
| download | libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.tar.gz | |
vpx_dsp_common: add VPX prefix to MIN/MAX
prevents redeclaration warnings;
vp8 has its own define which will be resolved in a future commit
Change-Id: Ic941fef3dd4262fcdce48b73075fe6b375f11c9c
Diffstat (limited to 'vp10/common/postproc.c')
| -rw-r--r-- | vp10/common/postproc.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp10/common/postproc.c b/vp10/common/postproc.c index 2d5b36aee..d273420aa 100644 --- a/vp10/common/postproc.c +++ b/vp10/common/postproc.c @@ -625,7 +625,7 @@ static void swap_mi_and_prev_mi(VP10_COMMON *cm) { int vp10_post_proc_frame(struct VP10Common *cm, YV12_BUFFER_CONFIG *dest, vp10_ppflags_t *ppflags) { - const int q = MIN(105, cm->lf.filter_level * 2); + const int q = VPXMIN(105, cm->lf.filter_level * 2); const int flags = ppflags->post_proc_flag; YV12_BUFFER_CONFIG *const ppbuf = &cm->post_proc_buffer; struct postproc_state *const ppstate = &cm->postproc_state; |