aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMans Rullgard <mans@mansr.com>2012-07-31 14:58:09 +0100
committerMans Rullgard <mans@mansr.com>2012-08-09 12:27:49 +0100
commit0db9eba48c8a27bc2373d02edda3340ef6f0e5fc (patch)
tree3c806e4baa623279273154f60961c44492cad4af
parent5bf7bc625ba75a44d9034d123d687375783d31e6 (diff)
downloadffmpeg-0db9eba48c8a27bc2373d02edda3340ef6f0e5fc.tar.gz
motion_est: drop inline from sad_hpel_motion_search()
This function is only ever called through a function pointer, so marking it inline makes no sense. Signed-off-by: Mans Rullgard <mans@mansr.com>
-rw-r--r--libavcodec/motion_est.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/motion_est.c b/libavcodec/motion_est.c
index ee4abea61b..4cf8a68df7 100644
--- a/libavcodec/motion_est.c
+++ b/libavcodec/motion_est.c
@@ -45,7 +45,7 @@
#define P_MEDIAN P[4]
#define P_MV1 P[9]
-static inline int sad_hpel_motion_search(MpegEncContext * s,
+static int sad_hpel_motion_search(MpegEncContext * s,
int *mx_ptr, int *my_ptr, int dmin,
int src_index, int ref_index,
int size, int h);
@@ -379,7 +379,7 @@ int ff_init_me(MpegEncContext *s){
COPY3_IF_LT(dminh, d, dx, x, dy, y)\
}
-static inline int sad_hpel_motion_search(MpegEncContext * s,
+static int sad_hpel_motion_search(MpegEncContext * s,
int *mx_ptr, int *my_ptr, int dmin,
int src_index, int ref_index,
int size, int h)