source/libvpx/vpx_dsp/vpx_dsp_common.h - Issue 1302353004: libvpx: Pull from upstream

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: source/libvpx/vpx_dsp/vpx_dsp_common.h

Issue 1302353004: libvpx: Pull from upstream (Closed) Base URL: https://chromium.googlesource.com/chromium/deps/libvpx.git@master

Patch Set: Created 5 years, 4 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: source/libvpx/vpx_dsp/vpx_dsp_common.h

diff --git a/source/libvpx/vpx_dsp/vpx_dsp_common.h b/source/libvpx/vpx_dsp/vpx_dsp_common.h

index ccb818959436abdef563ff5b01cbf8c9b2d4efeb..a83339efe394b4ec4a3104cbd8824c0034d7df42 100644

--- a/source/libvpx/vpx_dsp/vpx_dsp_common.h

+++ b/source/libvpx/vpx_dsp/vpx_dsp_common.h

@@ -19,8 +19,8 @@

extern "C" {

#endif

-#define MIN(x, y) (((x) < (y)) ? (x) : (y))

-#define MAX(x, y) (((x) > (y)) ? (x) : (y))

+#define VPXMIN(x, y) (((x) < (y)) ? (x) : (y))

+#define VPXMAX(x, y) (((x) > (y)) ? (x) : (y))

#if CONFIG_VP9_HIGHBITDEPTH

// Note:

« no previous file with comments | « source/libvpx/vpx_dsp/vpx_dsp.mk ('k') | source/libvpx/vpx_dsp/vpx_dsp_rtcd_defs.pl » ('j') | no next file with comments »