Merge commit '4da950c0ae224b9b8ef952dadf614be2c050023e'

* commit '4da950c0ae224b9b8ef952dadf614be2c050023e':
  lls: #ifndef --> #if in FF_API_ version guard

Merged-by: Michael Niedermayer <michaelni@gmx.at>

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
 

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 */