diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 11:22:15 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 11:23:43 +0200 |
| commit | c93a424718c38c6add273745f3792b531332ea88 (patch) | |
| tree | ab6de6854680c0f8499dcaf4cad0d90c1c470920 /libavcodec | |
| parent | d3bd320e63bfbc96d78a673a01d36f25dc6316e7 (diff) | |
| parent | 41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2 (diff) | |
| download | ffmpeg-c93a424718c38c6add273745f3792b531332ea88.tar.gz | |
Merge commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2'
* commit '41578f70cf8aec8e7565fba1ca7e07f3dc46c3d2':
lpc: use function pointers, in preparation for asm
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/lpc.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index eb7698bdfe..e2c0aacc43 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -216,7 +216,7 @@ int ff_lpc_calc_coefs(LPCContext *s, if(pass){ double eval, inv, rinv; - eval= avpriv_evaluate_lls(&m[(pass-1)&1], var+1, max_order-1); + eval= m[(pass-1)&1].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,7 +226,7 @@ int ff_lpc_calc_coefs(LPCContext *s, }else weight++; - avpriv_update_lls(&m[pass&1], var); + m[pass&1].update_lls(&m[pass&1], var); } avpriv_solve_lls(&m[pass&1], 0.001, 0); } diff --git a/libavcodec/version.h b/libavcodec/version.h index b59cdd2be8..d0af912e26 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -30,7 +30,7 @@ #define LIBAVCODEC_VERSION_MAJOR 55 #define LIBAVCODEC_VERSION_MINOR 17 -#define LIBAVCODEC_VERSION_MICRO 100 +#define LIBAVCODEC_VERSION_MICRO 101 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |