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>
This commit is contained in:
Michael Niedermayer 2012-08-12 13:43:03 +02:00
commit d0bf3bf1ff
6 changed files with 99 additions and 74 deletions

View file

@ -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;