From: Paul Wilkins Date: Mon, 14 Apr 2014 17:04:35 +0000 (-0700) Subject: Remove vp9_ prefix on static inline function. X-Git-Tag: v1.4.0~1805^2 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=19536d692e9466c043f5a333fb57b259d0e37af5;p=libvpx Remove vp9_ prefix on static inline function. This prefix reserved for global scope functions etc. Change-Id: I671cda2a63e01a40aae3d7407dd1bb4d338d709c --- diff --git a/vp9/encoder/vp9_onyx_int.h b/vp9/encoder/vp9_onyx_int.h index 9ad6ae49e..81f014d73 100644 --- a/vp9/encoder/vp9_onyx_int.h +++ b/vp9/encoder/vp9_onyx_int.h @@ -596,7 +596,7 @@ static INLINE YV12_BUFFER_CONFIG *get_ref_frame_buffer( // Intra only frames, golden frames (except alt ref overlays) and // alt ref frames tend to be coded at a higher than ambient quality -static INLINE int vp9_frame_is_boosted(const VP9_COMP *cpi) { +static INLINE int frame_is_boosted(const VP9_COMP *cpi) { return frame_is_intra_only(&cpi->common) || cpi->refresh_alt_ref_frame || (cpi->refresh_golden_frame && !cpi->rc.is_src_frame_alt_ref); } diff --git a/vp9/encoder/vp9_speed_features.c b/vp9/encoder/vp9_speed_features.c index f1fefe4ef..6948396a9 100644 --- a/vp9/encoder/vp9_speed_features.c +++ b/vp9/encoder/vp9_speed_features.c @@ -49,8 +49,8 @@ static void set_good_speed_feature(VP9_COMP *cpi, VP9_COMMON *cm, if (speed >= 1) { sf->use_square_partition_only = !frame_is_intra_only(cm); sf->less_rectangular_check = 1; - sf->tx_size_search_method = vp9_frame_is_boosted(cpi) ? USE_FULL_RD - : USE_LARGESTALL; + sf->tx_size_search_method = frame_is_boosted(cpi) ? USE_FULL_RD + : USE_LARGESTALL; if (MIN(cm->width, cm->height) >= 720) sf->disable_split_mask = cm->show_frame ? DISABLE_ALL_SPLIT