Browse code

Merge commit 'cc4c24208159200b7aff5b5c313903c7f23fa345'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

Hendrik Leppkes authored on 2016/01/02 18:13:58
Showing 4 changed files
... ...
@@ -70,9 +70,10 @@ int ff_audio_data_set_channels(AudioData *a, int channels)
70 70
     return 0;
71 71
 }
72 72
 
73
-int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels,
74
-                       int nb_samples, enum AVSampleFormat sample_fmt,
75
-                       int read_only, const char *name)
73
+int ff_audio_data_init(AudioData *a, uint8_t * const *src, int plane_size,
74
+                       int channels, int nb_samples,
75
+                       enum AVSampleFormat sample_fmt, int read_only,
76
+                       const char *name)
76 77
 {
77 78
     int p;
78 79
 
... ...
@@ -76,9 +76,10 @@ int ff_audio_data_set_channels(AudioData *a, int channels);
76 76
  * @param name            name for debug logging (can be NULL)
77 77
  * @return                0 on success, negative AVERROR value on error
78 78
  */
79
-int ff_audio_data_init(AudioData *a, uint8_t **src, int plane_size, int channels,
80
-                       int nb_samples, enum AVSampleFormat sample_fmt,
81
-                       int read_only, const char *name);
79
+int ff_audio_data_init(AudioData *a, uint8_t * const *src, int plane_size,
80
+                       int channels, int nb_samples,
81
+                       enum AVSampleFormat sample_fmt, int read_only,
82
+                       const char *name);
82 83
 
83 84
 /**
84 85
  * Allocate AudioData.
... ...
@@ -377,8 +377,9 @@ int avresample_get_out_samples(AVAudioResampleContext *avr, int in_nb_samples);
377 377
  *                        output FIFO
378 378
  */
379 379
 int avresample_convert(AVAudioResampleContext *avr, uint8_t **output,
380
-                       int out_plane_size, int out_samples, uint8_t **input,
381
-                       int in_plane_size, int in_samples);
380
+                       int out_plane_size, int out_samples,
381
+                       uint8_t * const *input, int in_plane_size,
382
+                       int in_samples);
382 383
 
383 384
 /**
384 385
  * Return the number of samples currently in the resampling delay buffer.
... ...
@@ -329,7 +329,8 @@ static int handle_buffered_output(AVAudioResampleContext *avr,
329 329
 
330 330
 int attribute_align_arg avresample_convert(AVAudioResampleContext *avr,
331 331
                                            uint8_t **output, int out_plane_size,
332
-                                           int out_samples, uint8_t **input,
332
+                                           int out_samples,
333
+                                           uint8_t * const *input,
333 334
                                            int in_plane_size, int in_samples)
334 335
 {
335 336
     AudioData input_buffer;