From: Yaowu Xu Date: Thu, 1 Sep 2016 15:45:22 +0000 (-0700) Subject: Replace inline with INLINE X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=958303c4c660079b78808f458401ce78dc8fb993;p=libvpx Replace inline with INLINE This fixes msvc build errors. Change-Id: I1344685e891db61ba569d818e0f2167b2978c299 --- diff --git a/av1/common/reconintra.c b/av1/common/reconintra.c index 3c08ac450..e1bf6f0a4 100644 --- a/av1/common/reconintra.c +++ b/av1/common/reconintra.c @@ -640,7 +640,7 @@ static void dr_prediction_z3(uint8_t *dst, ptrdiff_t stride, int bs, // If angle > 0 && angle < 90, dx = -((int)(256 / t)); // If angle > 90 && angle < 180, dx = (int)(256 / t); // If angle > 180 && angle < 270, dx = 1; -static inline int get_dx(int angle) { +static INLINE int get_dx(int angle) { if (angle > 0 && angle < 90) { return -dr_intra_derivative[angle]; } else if (angle > 90 && angle < 180) { @@ -655,7 +655,7 @@ static inline int get_dx(int angle) { // If angle > 0 && angle < 90, dy = 1; // If angle > 90 && angle < 180, dy = (int)(256 * t); // If angle > 180 && angle < 270, dy = -((int)(256 * t)); -static inline int get_dy(int angle) { +static INLINE int get_dy(int angle) { if (angle > 90 && angle < 180) { return dr_intra_derivative[angle - 90]; } else if (angle > 180 && angle < 270) { diff --git a/av1/encoder/firstpass.h b/av1/encoder/firstpass.h index 2b161a1f1..eaaafff05 100644 --- a/av1/encoder/firstpass.h +++ b/av1/encoder/firstpass.h @@ -182,7 +182,7 @@ void av1_calculate_coded_size(struct AV1_COMP *cpi, int *scaled_frame_width, int *scaled_frame_height); #if CONFIG_EXT_REFS -static inline int get_number_of_extra_arfs(int interval, int arf_pending) { +static INLINE int get_number_of_extra_arfs(int interval, int arf_pending) { if (arf_pending && MAX_EXT_ARFS > 0) return interval >= MIN_EXT_ARF_INTERVAL * (MAX_EXT_ARFS + 1) ? MAX_EXT_ARFS