diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-08-12 13:43:03 +0200 |
| commit | d0bf3bf1ffaf810d8e0737847666a9b86ea5929f (patch) | |
| tree | bc4e81051e590e5d33b401b6488ce381a37c6151 /libavresample | |
| parent | 6fd7bf7b03c068d0f91de03bdd9b4e91695680eb (diff) | |
| parent | bdefe22b8e8c5c1cbcb20595b8eedc052aa8e6e9 (diff) | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
lavf: Detect discontinuities in timestamps for framerate/analyzeduration calculation
lavf: Initialize the stream info timestamps in avformat_new_stream
id3v2: Match PIC mimetype/format case-insensitively
configure: Rename check_asm() to more fitting check_inline_asm()
fate: Only test enabled filters
avresample: De-doxygenize some comments where Doxygen is not appropriate
rtmp: split chunk_size var into in_chunk_size and out_chunk_size
rtmp: Factorize the code by adding find_tracked_method
Conflicts:
configure
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample')
| -rw-r--r-- | libavresample/resample.c | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/libavresample/resample.c b/libavresample/resample.c index 1c3d13ae0a..e6e0892c10 100644 --- a/libavresample/resample.c +++ b/libavresample/resample.c @@ -67,9 +67,7 @@ struct ResampleContext { #include "resample_template.c" -/** - * 0th order modified bessel function of the first kind. - */ +/* 0th order modified bessel function of the first kind. */ static double bessel(double x) { double v = 1; @@ -86,18 +84,7 @@ static double bessel(double x) return v; } -/** - * Build a polyphase filterbank. - * - * @param[out] filter filter coefficients - * @param factor resampling factor - * @param tap_count tap count - * @param phase_count phase count - * @param scale wanted sum of coefficients for each filter - * @param filter_type filter type - * @param kaiser_beta kaiser window beta - * @return 0 on success, negative AVERROR code on failure - */ +/* Build a polyphase filterbank. */ static int build_filter(ResampleContext *c) { int ph, i; |