diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2011-07-14 20:44:58 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2011-07-14 20:44:58 +0200 |
| commit | 5dc6bd86f0f5cfffb44b47e6e916119f26b12091 (patch) | |
| tree | 968252b8209375cdca411921e37bd6c9db66b487 /libavcodec/lpc.c | |
| parent | 1885824b20a493d25db4b8e5397666e3a68f45f2 (diff) | |
| parent | 6cb11979295ae5d3b9bad0965cbd6a06d9c9783b (diff) | |
| download | ffmpeg-streaming-5dc6bd86f0f5cfffb44b47e6e916119f26b12091.zip ffmpeg-streaming-5dc6bd86f0f5cfffb44b47e6e916119f26b12091.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
APIchanges: fill in missing hashes and dates.
Add an APIChanges entry and bump minor versions for recent changes.
ffmpeg: print the low bitrate warning after the codec is openend.
doxygen: Move function documentation into the macro generating the function.
doxygen: Make sure parameter names match between .c and .h files.
h264: move fill_decode_neighbors()/fill_decode_caches() to h264_mvpred.h
H.264: Add more x86 assembly for 10-bit H.264 predict functions
lavf: fix invalid reads in avformat_find_stream_info()
cmdutils: replace opt_default with opt_default2() and remove set_context_opts
ffmpeg: use new avcodec_open2 and avformat_find_stream_info API.
ffplay: use new avcodec_open2 and avformat_find_stream_info API.
cmdutils: store all codec options in one dict instead of video/audio/sub
ffmpeg: check experimental flag after codec is opened.
ffmpeg: do not set GLOBAL_HEADER flag in the options context
Conflicts:
cmdutils.c
doc/APIchanges
ffmpeg.c
ffplay.c
libavcodec/version.h
libavformat/version.h
libswscale/swscale_unscaled.c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec/lpc.c')
| -rw-r--r-- | libavcodec/lpc.c | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/libavcodec/lpc.c b/libavcodec/lpc.c index 9488a0f..c272088 100644 --- a/libavcodec/lpc.c +++ b/libavcodec/lpc.c @@ -149,10 +149,8 @@ static int estimate_best_order(double *ref, int min_order, int max_order) /** * Calculate LPC coefficients for multiple orders * - * @param lpc_type LPC method for determining coefficients - * 0 = LPC with fixed pre-defined coeffs - * 1 = LPC with coeffs determined by Levinson-Durbin recursion - * 2+ = LPC with coeffs determined by Cholesky factorization using (use_lpc-1) passes. + * @param lpc_type LPC method for determining coefficients, + * see #FFLPCType for details */ int ff_lpc_calc_coefs(LPCContext *s, const int32_t *samples, int blocksize, int min_order, |
