diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-11-16 16:42:57 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-11-17 16:41:08 +0100 |
| commit | c3814ab654a993723b0e5f14cc252d68f233ad79 (patch) | |
| tree | c099990491a0bd80e0835acaef1e1b384375e5ac /libavcodec | |
| parent | bbe66ef912470007f7cc424badde2ccec500b36b (diff) | |
| download | ffmpeg-c3814ab654a993723b0e5f14cc252d68f233ad79.tar.gz | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/lpc.c | 6 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 4 insertions, 4 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++){ diff --git a/libavcodec/version.h b/libavcodec/version.h index a6ee4cffd6..8db02700e9 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 43 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |