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/vp10_dx_iface.c | |
| parent | 205532f3a76752bec3a8b4d229c5fbf569b29922 (diff) | |
| download | libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.tar libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.tar.gz libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.tar.bz2 libvpx-5e16d397bd67b6d870c1ac34f50799f5c2fd6f91.zip | |
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/vp10_dx_iface.c')
| -rw-r--r-- | vp10/vp10_dx_iface.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/vp10/vp10_dx_iface.c b/vp10/vp10_dx_iface.c index 184810386..0ff64dfba 100644 --- a/vp10/vp10_dx_iface.c +++ b/vp10/vp10_dx_iface.c @@ -183,7 +183,7 @@ static vpx_codec_err_t decoder_peek_si_internal(const uint8_t *data, si->w = si->h = 0; if (decrypt_cb) { - data_sz = MIN(sizeof(clear_buffer), data_sz); + data_sz = VPXMIN(sizeof(clear_buffer), data_sz); decrypt_cb(decrypt_state, data, clear_buffer, data_sz); data = clear_buffer; } |