diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 16:42:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 19:12:29 +0100 |
| commit | b276b913a175f0c5b737e1e1067ddd3f8fcfdb2a (patch) | |
| tree | de86b5adebe39af9df3af4546aa753bba71c9e8f /libavcodec/lpc.c | |
| parent | d89e14bf54c886441eb919d2588ccc2ce6050706 (diff) | |
| download | android_external_ffmpeg-b276b913a175f0c5b737e1e1067ddd3f8fcfdb2a.tar.gz android_external_ffmpeg-b276b913a175f0c5b737e1e1067ddd3f8fcfdb2a.tar.bz2 android_external_ffmpeg-b276b913a175f0c5b737e1e1067ddd3f8fcfdb2a.zip | |
rename new lls code to lls2 to avoid conflict with the old which has a different ABI
also remove failed attempt at a compatibility layer, the code simply cannot work
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
(cherry picked from commit c3814ab654a993723b0e5f14cc252d68f233ad79)
Conflicts:
libavcodec/version.h
Diffstat (limited to 'libavcodec/lpc.c')
| -rw-r--r-- | libavcodec/lpc.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 198903028b..a6f23775a5 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -208,7 +208,7 @@ int ff_lpc_calc_coefs(LPCContext *s, } if (lpc_type == FF_LPC_TYPE_CHOLESKY) { - LLSModel m[2]; + LLSModel2 m[2]; LOCAL_ALIGNED(32, double, var, [FFALIGN(MAX_LPC_ORDER+1,4)]); double av_uninit(weight); memset(var, 0, FFALIGN(MAX_LPC_ORDER+1,4)*sizeof(*var)); @@ -217,7 +217,7 @@ int ff_lpc_calc_coefs(LPCContext *s, m[0].coeff[max_order-1][j] = -lpc[max_order-1][j]; for(; pass<lpc_passes; pass++){ - avpriv_init_lls(&m[pass&1], max_order); + avpriv_init_lls2(&m[pass&1], max_order); weight=0; for(i=max_order; i<blocksize; i++){ @@ -238,7 +238,7 @@ int ff_lpc_calc_coefs(LPCContext *s, m[pass&1].update_lls(&m[pass&1], var); } - avpriv_solve_lls(&m[pass&1], 0.001, 0); + avpriv_solve_lls2(&m[pass&1], 0.001, 0); } for(i=0; i<max_order; i++){ |