virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-10-30 23:18:11 +02:00
Code Issues Releases Activity

Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345'

Browse Source 
* commit 'cc4c24208159200b7aff5b5c313903c7f23fa345':
  avresample: Mark avresample_buffer() as pointer to const

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes
2016-01-02 10:13:58 +01:00
parent b966a403dd cc4c242081
commit d1262262de
4 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
libavresample/audio_data.c
View File

@@ -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;

7
libavresample/audio_data.h
View File

@@ -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.

5
libavresample/avresample.h
View File

@@ -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.

3
libavresample/utils.c
View File

@@ -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;