diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 23:00:23 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-11-05 23:01:34 +0100 |
| commit | 649384290089ff6ede80aceb050803707be72bb5 (patch) | |
| tree | 58c24137ba2576fe102b1677194e8d4e2c3f5362 /libavcodec/flacdsp.h | |
| parent | 7d26be63c25e715f008e8923654bdf318419dd39 (diff) | |
| parent | 8a58894fc63c9d367c4cd6a17e277d1a8608c2c0 (diff) | |
| download | ffmpeg-649384290089ff6ede80aceb050803707be72bb5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
FATE: add a 24-bit FLAC encoding test
FATE: rename FLAC tests from flac-* to flac-16-*
flacenc: use RICE2 entropy coding mode for 24-bit
flacenc: add 24-bit encoding
flacdsp: move lpc encoding from FLAC encoder to FLACDSPContext
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/flacdsp.h')
| -rw-r--r-- | libavcodec/flacdsp.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/flacdsp.h b/libavcodec/flacdsp.h index 00be2659ce..5e66dc2f10 100644 --- a/libavcodec/flacdsp.h +++ b/libavcodec/flacdsp.h @@ -27,6 +27,8 @@ typedef struct FLACDSPContext { int len, int shift); void (*lpc)(int32_t *samples, const int coeffs[32], int order, int qlevel, int len); + void (*lpc_encode)(int32_t *res, const int32_t *smp, int len, int order, + const int32_t *coefs, int shift); } FLACDSPContext; void ff_flacdsp_init(FLACDSPContext *c, enum AVSampleFormat fmt, int bps); |