From b473c9937ebe9aafef9d2e07f080fb12ecc53ef4 Mon Sep 17 00:00:00 2001 From: Stefano Sabatini Date: Sun, 25 Nov 2012 20:23:32 +0100 Subject: lavu/samplefmt: return the size of the allocated samples buffer at the next bump Make the functions av_samples_fill_arrays, av_samples_alloc, and avcodec_fill_audio_frame return a buffer size rather than 0 in case of success. This will be enabled at the next libavutil major bump, in order to preserve backward compatibility. Returning the size allows to simplify the code, avoiding a few function calls. --- libavutil/samplefmt.h | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'libavutil/samplefmt.h') diff --git a/libavutil/samplefmt.h b/libavutil/samplefmt.h index 17300d1e95..e222ba2ad9 100644 --- a/libavutil/samplefmt.h +++ b/libavutil/samplefmt.h @@ -183,7 +183,9 @@ int av_samples_get_buffer_size(int *linesize, int nb_channels, int nb_samples, * @param nb_samples the number of samples in a single channel * @param sample_fmt the sample format * @param align buffer size alignment (0 = default, 1 = no alignment) - * @return 0 on success or a negative error code on failure + * @return >=0 on success or a negative error code on failure + * @todo return minimum size in bytes required for the buffer in case + * of success at the next bump */ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, const uint8_t *buf, @@ -204,7 +206,8 @@ int av_samples_fill_arrays(uint8_t **audio_data, int *linesize, * @param nb_channels number of audio channels * @param nb_samples number of samples per channel * @param align buffer size alignment (0 = default, 1 = no alignment) - * @return 0 on success or a negative error code on failure + * @return >=0 on success or a negative error code on failure + * @todo return the size of the allocated buffer in case of success at the next bump * @see av_samples_fill_arrays() */ int av_samples_alloc(uint8_t **audio_data, int *linesize, int nb_channels, -- cgit v1.2.3