[FFmpeg-devel] [PATCH 06/10] swr: make swr_* functions match the prototypes.

Clément Bœsch ubitux at gmail.com
Wed Nov 16 21:50:53 CET 2011


---
 libswresample/swresample.c |   12 ++++++------
 1 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index bbe0d16..3c1dcc6 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -73,7 +73,7 @@ static const AVClass av_class = {
 static int resample(SwrContext *s, AudioData *out_param, int out_count,
                              const AudioData * in_param, int in_count);
 
-SwrContext *swr_alloc(void){
+struct SwrContext *swr_alloc(void){
     SwrContext *s= av_mallocz(sizeof(SwrContext));
     if(s){
         s->av_class= &av_class;
@@ -82,10 +82,10 @@ SwrContext *swr_alloc(void){
     return s;
 }
 
-SwrContext *swr_alloc_set_opts(struct SwrContext *s,
-                               int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
-                               int64_t  in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
-                               const int *channel_map, int log_offset, void *log_ctx){
+struct SwrContext *swr_alloc_set_opts(struct SwrContext *s,
+                                      int64_t out_ch_layout, enum AVSampleFormat out_sample_fmt, int out_sample_rate,
+                                      int64_t  in_ch_layout, enum AVSampleFormat  in_sample_fmt, int  in_sample_rate,
+                                      const int *channel_map, int log_offset, void *log_ctx){
     if(!s) s= swr_alloc();
     if(!s) return NULL;
 
@@ -129,7 +129,7 @@ void swr_free(SwrContext **ss){
     av_freep(ss);
 }
 
-int swr_init(SwrContext *s){
+int swr_init(struct SwrContext *s){
     s->in_buffer_index= 0;
     s->in_buffer_count= 0;
     s->resample_in_constraint= 0;
-- 
1.7.7.3



More information about the ffmpeg-devel mailing list