summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2013-03-01 13:32:12 +0100
committerMichael Niedermayer <michaelni@gmx.at>2013-03-01 13:32:16 +0100
commit28bb17ca362286c92384e466d0c47f702f5d2e3d (patch)
tree8715dd7676a1fdfbdaac2651fa47883edbda19c3
parent76f8d3c8d9211daca678747e9521c7ed9e90aba9 (diff)
parent399663be9d4a839b894c48a21b62926eb8497d72 (diff)
downloadffmpeg-streaming-28bb17ca362286c92384e466d0c47f702f5d2e3d.zip
ffmpeg-streaming-28bb17ca362286c92384e466d0c47f702f5d2e3d.tar.gz
Merge commit '399663be9d4a839b894c48a21b62926eb8497d72'
* commit '399663be9d4a839b894c48a21b62926eb8497d72': lls: mark max_order as unsigned short Merged-by: Michael Niedermayer <michaelni@gmx.at>
-rw-r--r--libavutil/lls.c2
-rw-r--r--libavutil/lls.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavutil/lls.c b/libavutil/lls.c
index 13eea96..749163e 100644
--- a/libavutil/lls.c
+++ b/libavutil/lls.c
@@ -48,7 +48,7 @@ void avpriv_update_lls(LLSModel *m, double *var, double decay)
}
}
-void avpriv_solve_lls(LLSModel *m, double threshold, int min_order)
+void avpriv_solve_lls(LLSModel *m, double threshold, unsigned short min_order)
{
int i, j, k;
double (*factor)[MAX_VARS + 1] = (void *) &m->covariance[1][0];
diff --git a/libavutil/lls.h b/libavutil/lls.h
index 0f02c8d..d8d53d0 100644
--- a/libavutil/lls.h
+++ b/libavutil/lls.h
@@ -39,7 +39,7 @@ typedef struct LLSModel {
void avpriv_init_lls(LLSModel *m, int indep_count);
void avpriv_update_lls(LLSModel *m, double *param, double decay);
-void avpriv_solve_lls(LLSModel *m, double threshold, int min_order);
+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
OpenPOWER on IntegriCloud