Browse Source

lavr: make avresample_read() with NULL output discard samples.

tags/n0.11
Anton Khirnov 13 years ago
parent
commit
0982b0a431
3 changed files with 5 additions and 2 deletions
  1. +2
    -1
      libavresample/avresample.h
  2. +2
    -0
      libavresample/utils.c
  3. +1
    -1
      libavresample/version.h

+ 2
- 1
libavresample/avresample.h View File

@@ -274,7 +274,8 @@ int avresample_available(AVAudioResampleContext *avr);
* @see avresample_convert()
*
* @param avr audio resample context
* @param output output data pointers
* @param output output data pointers. May be NULL, in which case
* nb_samples of data is discarded from output FIFO.
* @param nb_samples number of samples to read from the FIFO
* @return the number of samples written to output
*/


+ 2
- 0
libavresample/utils.c View File

@@ -385,6 +385,8 @@ int avresample_available(AVAudioResampleContext *avr)

int avresample_read(AVAudioResampleContext *avr, void **output, int nb_samples)
{
if (!output)
return av_audio_fifo_drain(avr->out_fifo, nb_samples);
return av_audio_fifo_read(avr->out_fifo, output, nb_samples);
}



+ 1
- 1
libavresample/version.h View File

@@ -21,7 +21,7 @@

#define LIBAVRESAMPLE_VERSION_MAJOR 0
#define LIBAVRESAMPLE_VERSION_MINOR 0
#define LIBAVRESAMPLE_VERSION_MICRO 1
#define LIBAVRESAMPLE_VERSION_MICRO 2

#define LIBAVRESAMPLE_VERSION_INT AV_VERSION_INT(LIBAVRESAMPLE_VERSION_MAJOR, \
LIBAVRESAMPLE_VERSION_MINOR, \


Loading…
Cancel
Save