aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/swresample.c
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-16 19:43:58 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-17 10:16:07 +0100
commit645c61fb2b9e434768a59f3c52f093d726061d95 (patch)
tree20e6442056ba28ef1c28df578373db302a1f8150 /libswresample/swresample.c
parentc4deb90cfaf7ef64bb80216ca1aa95db95a6f521 (diff)
downloadffmpeg-645c61fb2b9e434768a59f3c52f093d726061d95.tar.gz
swr: rename swr_alloc2() to swr_alloc_set_opts().
Diffstat (limited to 'libswresample/swresample.c')
-rw-r--r--libswresample/swresample.c7
1 files changed, 4 insertions, 3 deletions
diff --git a/libswresample/swresample.c b/libswresample/swresample.c
index 0a2aa9540f..88dacd6910 100644
--- a/libswresample/swresample.c
+++ b/libswresample/swresample.c
@@ -82,9 +82,10 @@ SwrContext *swr_alloc(void){
return s;
}
-SwrContext *swr_alloc2(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){
+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;