diff options
author | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 12:13:58 +0300 |
---|---|---|
committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2016-01-02 12:13:58 +0300 |
commit | d1262262de8402109cd5f1d6c4971d956c99f11e (patch) | |
tree | 9d458cf4ce187b5f9d64267994945c070ab647aa | |
parent | b966a403dd80604bb7dbb9ee6ec331ade0e84953 (diff) | |
parent | cc4c24208159200b7aff5b5c313903c7f23fa345 (diff) |
Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345'
* commit 'cc4c24208159200b7aff5b5c313903c7f23fa345':
avresample: Mark avresample_buffer() as pointer to const
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
-rw-r--r-- | libavresample/audio_data.c | 7 | ||||
-rw-r--r-- | libavresample/audio_data.h | 7 | ||||
-rw-r--r-- | libavresample/avresample.h | 5 | ||||
-rw-r--r-- | libavresample/utils.c | 3 |
4 files changed, 13 insertions, 9 deletions
diff --git a/libavresample/audio_data.c b/libavresample/audio_data.c index c2f545013c..b54ead841a 100644 --- a/libavresample/audio_data.c +++ b/libavresample/audio_data.c @@ -70,9 +70,10 @@ int ff_audio_data_set_channels(AudioData *a, int channels) return 0; } -int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels, - int nb_samples, enum AVSampleFormat sample_fmt, - int read_only, const char *name) +int ff_audio_data_init(AudioData *a, uint8_t * const *src, int plane_size, + int channels, int nb_samples, + enum AVSampleFormat sample_fmt, int read_only, + const char *name) { int p; diff --git a/libavresample/audio_data.h b/libavresample/audio_data.h index b50bd40600..1280307a95 100644 --- a/libavresample/audio_data.h +++ b/libavresample/audio_data.h @@ -76,9 +76,10 @@ int ff_audio_data_set_channels(AudioData *a, int channels); * @param name name for debug logging (can be NULL) * @return 0 on success, negative AVERROR value on error */ -int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels, - int nb_samples, enum AVSampleFormat sample_fmt, - int read_only, const char *name); +int ff_audio_data_init(AudioData *a, uint8_t * const *src, int plane_size, + int channels, int nb_samples, + enum AVSampleFormat sample_fmt, int read_only, + const char *name); /** * Allocate AudioData. diff --git a/libavresample/avresample.h b/libavresample/avresample.h index 2431bddcc6..1c2bce841e 100644 --- a/libavresample/avresample.h +++ b/libavresample/avresample.h @@ -377,8 +377,9 @@ int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples); * output FIFO */ int avresample_convert(AVAudioResampleContext *avr, uint8_t **output, - int out_plane_size, int out_samples, uint8_t **input, - int in_plane_size, int in_samples); + int out_plane_size, int out_samples, + uint8_t * const *input, int in_plane_size, + int in_samples); /** * Return the number of samples currently in the resampling delay buffer. diff --git a/libavresample/utils.c b/libavresample/utils.c index e3185873d9..b4fb906556 100644 --- a/libavresample/utils.c +++ b/libavresample/utils.c @@ -329,7 +329,8 @@ static int handle_buffered_output(AVAudioResampleContext *avr, int attribute_align_arg avresample_convert(AVAudioResampleContext *avr, uint8_t **output, int out_plane_size, - int out_samples, uint8_t **input, + int out_samples, + uint8_t * const *input, int in_plane_size, int in_samples) { AudioData input_buffer; |