diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 13:44:27 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 13:44:46 +0100 |
| commit | 7da1b235e82eb41239cc0f830a42702d037de71f (patch) | |
| tree | fb28d36a528ff9b3ef137d43fe9e040ecb3dd00d | |
| parent | 1a7166a58d697ac43eda546f4ccbddeb0e078196 (diff) | |
| parent | 4da950c0ae224b9b8ef952dadf614be2c050023e (diff) | |
Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'
* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
lls: #ifndef --> #if in FF_API_ version guard
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | libavutil/lls.c | 5 | ||||
| -rw-r--r-- | libavutil/lls.h | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/libavutil/lls.c b/libavutil/lls.c index 749163e68b..9384d12c93 100644 --- a/libavutil/lls.c +++ b/libavutil/lls.c @@ -28,6 +28,7 @@ #include <math.h> #include <string.h> +#include "version.h" #include "lls.h" void avpriv_init_lls(LLSModel *m, int indep_count) @@ -116,7 +117,7 @@ double avpriv_evaluate_lls(LLSModel *m, double *param, int order) return out; } -#ifndef FF_API_LLS_PRIVATE +#if FF_API_LLS_PRIVATE void av_init_lls(LLSModel *m, int indep_count) { return avpriv_init_lls(m, indep_count); @@ -133,7 +134,7 @@ double av_evaluate_lls(LLSModel *m, double *param, int order) { return avpriv_evaluate_lls(m, param, order); } -#endif +#endif /* FF_API_LLS_PRIVATE */ #ifdef TEST diff --git a/libavutil/lls.h b/libavutil/lls.h index d8d53d0a3d..c785d44421 100644 --- a/libavutil/lls.h +++ b/libavutil/lls.h @@ -23,6 +23,8 @@ #ifndef AVUTIL_LLS_H #define AVUTIL_LLS_H +#include "version.h" + #define MAX_VARS 32 //FIXME avoid direct access to LLSModel from outside @@ -42,10 +44,11 @@ void avpriv_update_lls(LLSModel *m, double *param, double decay); void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order); double avpriv_evaluate_lls(LLSModel *m, double *param, int order); -#ifndef FF_API_LLS_PRIVATE +#if FF_API_LLS_PRIVATE void av_init_lls(LLSModel *m, int indep_count); void av_update_lls(LLSModel *m, double *param, double decay); void av_solve_lls(LLSModel *m, double threshold, int min_order); double av_evaluate_lls(LLSModel *m, double *param, int order); -#endif +#endif /* FF_API_LLS_PRIVATE */ + #endif /* AVUTIL_LLS_H */ |