Merge "Convert small static functions in header to inline.."

59ff7c68 · Jim Bankoski · Gerrit Code Review · 09d374f0 · b5f59ea2 · 59ff7c68
Commit 59ff7c68 authored Feb 10, 2014 by Jim Bankoski Committed by Gerrit Code Review Feb 10, 2014
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

vp9/common/vp9_scale.h vp9/common/vp9_scale.h +2 -2

No files found.
--- a/vp9/common/vp9_scale.h
+++ b/vp9/common/vp9_scale.h
@@ -40,12 +40,12 @@ void vp9_setup_scale_factors_for_frame(struct scale_factors *sf,
                                       int other_w, int other_h,
                                       int this_w, int this_h);

-static int vp9_is_valid_scale(const struct scale_factors *sf) {
+static INLINE int vp9_is_valid_scale(const struct scale_factors *sf) {
  return sf->x_scale_fp != REF_INVALID_SCALE &&
         sf->y_scale_fp != REF_INVALID_SCALE;
 }

-static int vp9_is_scaled(const struct scale_factors *sf) {
+static INLINE int vp9_is_scaled(const struct scale_factors *sf) {
  return sf->x_scale_fp != REF_NO_SCALE ||
         sf->y_scale_fp != REF_NO_SCALE;
 }