diff options
| author | Johann <johannkoenig@google.com> | 2016-02-04 14:40:26 -0800 |
|---|---|---|
| committer | Johann <johannkoenig@google.com> | 2016-02-04 14:40:26 -0800 |
| commit | c927526be9a7b72fb5edb3f29c4e8ceabe0ec98a (patch) | |
| tree | f42181486e87a18dba9945956209fae0366172cb /libvpx/vp9/common/vp9_postproc.c | |
| parent | f6b4688a322153024a01a8bb2f3a79b5cd0492e3 (diff) | |
| download | libvpx-c927526be9a7b72fb5edb3f29c4e8ceabe0ec98a.tar.gz | |
Update external/libvpx to 1.5.0 release
Change-Id: Idbffcaf52c19f78927c57e4947fc230d48836076
(cherry picked from commit 2263fc984bdc858ee931d3e35c87c404de923950)
Diffstat (limited to 'libvpx/vp9/common/vp9_postproc.c')
| -rw-r--r-- | libvpx/vp9/common/vp9_postproc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libvpx/vp9/common/vp9_postproc.c b/libvpx/vp9/common/vp9_postproc.c index 71ab86150..b685d813b 100644 --- a/libvpx/vp9/common/vp9_postproc.c +++ b/libvpx/vp9/common/vp9_postproc.c @@ -16,6 +16,7 @@ #include "./vpx_scale_rtcd.h" #include "./vp9_rtcd.h" +#include "vpx_dsp/vpx_dsp_common.h" #include "vpx_ports/mem.h" #include "vpx_ports/system_state.h" #include "vpx_scale/vpx_scale.h" @@ -625,7 +626,7 @@ static void swap_mi_and_prev_mi(VP9_COMMON *cm) { int vp9_post_proc_frame(struct VP9Common *cm, YV12_BUFFER_CONFIG *dest, vp9_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; |