diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 11:30:07 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-30 11:35:52 +0200 |
| commit | 78b547963362cc9827d92dc0808534b757ab05d4 (patch) | |
| tree | 5b15d364e43e987ea2be5c381d0e99e9b303d958 /libavcodec | |
| parent | c93a424718c38c6add273745f3792b531332ea88 (diff) | |
| parent | 502ab21af0ca68f76d6112722c46d2f35c004053 (diff) | |
| download | ffmpeg-78b547963362cc9827d92dc0808534b757ab05d4.tar.gz | |
Merge commit '502ab21af0ca68f76d6112722c46d2f35c004053'
* commit '502ab21af0ca68f76d6112722c46d2f35c004053':
x86: lpc: simd av_update_lls
The versions are bumped due to changes in lls.h which is used across
libraries affecting intra library ABI
(This version bump also covers changes to lls.h in the immedeatly previous
commits)
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/lpc.c | 4 | ||||
| -rw-r--r-- | libavcodec/version.h | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index e2c0aacc43..559a87d161 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -201,7 +201,9 @@ int ff_lpc_calc_coefs(LPCContext *s, ref[i] = fabs(lpc[i][i]); } else if (lpc_type == FF_LPC_TYPE_CHOLESKY) { LLSModel m[2]; - double var[MAX_LPC_ORDER+1], av_uninit(weight); + 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)); if(lpc_passes <= 0) lpc_passes = 2; diff --git a/libavcodec/version.h b/libavcodec/version.h index d0af912e26..b9a2bc4b0d 100644 --- a/libavcodec/version.h +++ b/libavcodec/version.h @@ -29,8 +29,8 @@ #include "libavutil/avutil.h" #define LIBAVCODEC_VERSION_MAJOR 55 -#define LIBAVCODEC_VERSION_MINOR 17 -#define LIBAVCODEC_VERSION_MICRO 101 +#define LIBAVCODEC_VERSION_MINOR 18 +#define LIBAVCODEC_VERSION_MICRO 100 #define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \ LIBAVCODEC_VERSION_MINOR, \ |