diff options
| author | James Zern <jzern@google.com> | 2015-08-27 14:46:08 -0700 |
|---|---|---|
| committer | James Zern <jzern@google.com> | 2015-08-27 15:31:24 -0700 |
| commit | 820302a394095e3a22ff68c692c56498919118ab (patch) | |
| tree | 64d134bd6e902c31d5a9162d71656581db9fb5fc /vp8/decoder/dboolhuff.c | |
| parent | 5c245a46d83d54f129f42db1a3bf7b2a2832252b (diff) | |
| download | libvpx-820302a394095e3a22ff68c692c56498919118ab.tar libvpx-820302a394095e3a22ff68c692c56498919118ab.tar.gz libvpx-820302a394095e3a22ff68c692c56498919118ab.tar.bz2 libvpx-820302a394095e3a22ff68c692c56498919118ab.zip | |
vp8: use VPX(MIN|MAX) from vpx_dsp_common.h
remove MIN/MAX defines in vp8/common/common.h
Change-Id: I41520f34af175e05b263ebd12198f4de29a967db
Diffstat (limited to 'vp8/decoder/dboolhuff.c')
| -rw-r--r-- | vp8/decoder/dboolhuff.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/vp8/decoder/dboolhuff.c b/vp8/decoder/dboolhuff.c index b874d4c46..8a7e33205 100644 --- a/vp8/decoder/dboolhuff.c +++ b/vp8/decoder/dboolhuff.c @@ -11,6 +11,7 @@ #include "dboolhuff.h" #include "vp8/common/common.h" +#include "vpx_dsp/vpx_dsp_common.h" int vp8dx_start_decode(BOOL_DECODER *br, const unsigned char *source, @@ -48,7 +49,7 @@ void vp8dx_bool_decoder_fill(BOOL_DECODER *br) unsigned char decrypted[sizeof(VP8_BD_VALUE) + 1]; if (br->decrypt_cb) { - size_t n = MIN(sizeof(decrypted), bytes_left); + size_t n = VPXMIN(sizeof(decrypted), bytes_left); br->decrypt_cb(br->decrypt_state, bufptr, decrypted, (int)n); bufptr = decrypted; } |