update ffmpeg resampler from upstream SVN

This commit is contained in:
Lennart Poettering 2008-06-27 22:03:44 +02:00
parent 0fb402c8d4
commit 2490f698c0

View file

@ -208,7 +208,7 @@ void av_resample_close(AVResampleContext *c){
/** /**
* Compensates samplerate/timestamp drift. The compensation is done by changing * Compensates samplerate/timestamp drift. The compensation is done by changing
* the resampler parameters, so no audible clicks or similar distortions ocur * the resampler parameters, so no audible clicks or similar distortions occur
* @param compensation_distance distance in output samples over which the compensation should be performed * @param compensation_distance distance in output samples over which the compensation should be performed
* @param sample_delta number of output samples which should be output less * @param sample_delta number of output samples which should be output less
* *
@ -231,7 +231,7 @@ void av_resample_compensate(AVResampleContext *c, int sample_delta, int compensa
* @param src_size the number of unconsumed samples available * @param src_size the number of unconsumed samples available
* @param dst_size the amount of space in samples available in dst * @param dst_size the amount of space in samples available in dst
* @param update_ctx if this is 0 then the context wont be modified, that way several channels can be resampled with the same context * @param update_ctx if this is 0 then the context wont be modified, that way several channels can be resampled with the same context
* @return the number of samples written in dst or -1 if an error occured * @return the number of samples written in dst or -1 if an error occurred
*/ */
int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx){ int av_resample(AVResampleContext *c, short *dst, short *src, int *consumed, int src_size, int dst_size, int update_ctx){
int dst_index, i; int dst_index, i;