diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 13:19:00 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-03-01 13:19:00 +0100 |
| commit | 76f8d3c8d9211daca678747e9521c7ed9e90aba9 (patch) | |
| tree | eb69348de94a6b7133c440740fe33ad21dc0640d /libavcodec/lpc.c | |
| parent | fb4b1607561c167b5018641829387447cc8fb51d (diff) | |
| parent | 9d4da474f5f40b019cb4cb931c8499deee586174 (diff) | |
| download | ffmpeg-streaming-76f8d3c8d9211daca678747e9521c7ed9e90aba9.zip ffmpeg-streaming-76f8d3c8d9211daca678747e9521c7ed9e90aba9.tar.gz | |
Merge commit '9d4da474f5f40b019cb4cb931c8499deee586174'
* commit '9d4da474f5f40b019cb4cb931c8499deee586174':
lls: move to the private namespace
Conflicts:
libavutil/version.h
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lpc.c')
| -rw-r--r-- | libavcodec/lpc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 019689a..4149135 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -207,7 +207,7 @@ int ff_lpc_calc_coefs(LPCContext *s, lpc_passes = 2; for(pass=0; pass<lpc_passes; pass++){ - av_init_lls(&m[pass&1], max_order); + avpriv_init_lls(&m[pass&1], max_order); weight=0; for(i=max_order; i<blocksize; i++){ @@ -216,7 +216,7 @@ int ff_lpc_calc_coefs(LPCContext *s, if(pass){ double eval, inv, rinv; - eval= av_evaluate_lls(&m[(pass-1)&1], var+1, max_order-1); + eval= avpriv_evaluate_lls(&m[(pass-1)&1], var+1, max_order-1); eval= (512>>pass) + fabs(eval - var[0]); inv = 1/eval; rinv = sqrt(inv); @@ -226,9 +226,9 @@ int ff_lpc_calc_coefs(LPCContext *s, }else weight++; - av_update_lls(&m[pass&1], var, 1.0); + avpriv_update_lls(&m[pass&1], var, 1.0); } - av_solve_lls(&m[pass&1], 0.001, 0); + avpriv_solve_lls(&m[pass&1], 0.001, 0); } for(i=0; i<max_order; i++){ |
