diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 13:23:05 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-10-06 13:45:08 +0200 |
| commit | 55c49afc42abae64e5ab25e04bc3c09b17c5b6d5 (patch) | |
| tree | 3e56007e0d3039ee6aa91e0e87b9abc14a49bf94 /libavresample/utils.c | |
| parent | 886c3662d308e97316a606732574f0e87b1cbe3a (diff) | |
| parent | d3a72becc6371563185a509b94f5daf32ddbb485 (diff) | |
| download | ffmpeg-55c49afc42abae64e5ab25e04bc3c09b17c5b6d5.tar.gz | |
Merge remote-tracking branch 'qatar/master'
* qatar/master:
yuv4mpeg: return proper error codes.
Give all anonymously typedeffed structs in headers a name
fate: Add parseutils test
parseutils-test: Drop random colors from parsing test
vf_pad/scale: use double precision for aspect ratios.
build: error on variable-length arrays
ppc: swscale: rework yuv2planeX_altivec()
ppc: fmtconvert: kill VLA in float_to_int16_interleave_altivec()
x86: dsputil: kill VLA in gmc_mmx()
libspeexenc: Updated commentary to reflect recent changes
libspeexenc: Add an option for enabling DTX
doc/APIchanges: fill in missing dates and hashes.
lavr: bump major to 1 and declare it stable.
lavr: change the type of the data buffers to uint8_t**.
lavc: deprecate the audio resampling API.
Conflicts:
cmdutils.h
configure
doc/APIchanges
ffplay.c
libavcodec/dwt.h
libavcodec/libspeexenc.c
libavfilter/vf_pad.c
libavfilter/vf_scale.c
libavformat/asf.h
tests/fate/libavutil.mak
tests/ref/fate/parseutils
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavresample/utils.c')
| -rw-r--r-- | libavresample/utils.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/libavresample/utils.c b/libavresample/utils.c index 81292930d4..2a0aacd4c0 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -247,8 +247,8 @@ static int handle_buffered_output(AVAudioResampleContext *avr, } int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, - void **output, int out_plane_size, - int out_samples, void **input, + uint8_t **output, int out_plane_size, + int out_samples, uint8_t **input, int in_plane_size, int in_samples) { AudioData input_buffer; @@ -410,11 +410,11 @@ int avresample_available(AVAudioResampleContext *avr) return av_audio_fifo_size(avr->out_fifo); } -int avresample_read(AVAudioResampleContext *avr, void **output, int nb_samples) +int avresample_read(AVAudioResampleContext *avr, uint8_t **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); + return av_audio_fifo_read(avr->out_fifo, (void**)output, nb_samples); } unsigned avresample_version(void) |