diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:45:47 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-19 18:46:04 +0200 |
| commit | d303e0affd9274381a098da55ef4eca954f23b74 (patch) | |
| tree | 00a54bf98aa0c13c3689ec694b07e50a21102951 /libavcodec/lsp.h | |
| parent | 257f274dfa000ae0add4aef8bd11375c8d32add0 (diff) | |
| parent | 3e9409b1d0ca6ee7063fa04d940af36a20b46a8b (diff) | |
| download | ffmpeg-d303e0affd9274381a098da55ef4eca954f23b74.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
simple_idct: simplify some ifdeffery
simple_idct: remove code for DCTELEM != int16
Remove VLAs in ff_amrwb_lsp2lpc()
fate: make vsynth tests depend on only the relevant vref
rtsp: remove disabled code
dsputil: restore mistakenly removed hunk of disabled code
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lsp.h')
| -rw-r--r-- | libavcodec/lsp.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavcodec/lsp.h b/libavcodec/lsp.h index 1230669b1a..46a2d47beb 100644 --- a/libavcodec/lsp.h +++ b/libavcodec/lsp.h @@ -91,7 +91,7 @@ void ff_amrwb_lsp2lpc(const double *lsp, float *lp, int lp_order); void ff_acelp_lp_decode(int16_t* lp_1st, int16_t* lp_2nd, const int16_t* lsp_2nd, const int16_t* lsp_prev, int lp_order); -#define MAX_LP_HALF_ORDER 8 +#define MAX_LP_HALF_ORDER 10 #define MAX_LP_ORDER (2*MAX_LP_HALF_ORDER) /** |