From 645c61fb2b9e434768a59f3c52f093d726061d95 Mon Sep 17 00:00:00 2001 From: Clément Bœsch Date: Wed, 16 Nov 2011 19:43:58 +0100 Subject: swr: rename swr_alloc2() to swr_alloc_set_opts(). --- libswresample/swresample.h | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'libswresample/swresample.h') diff --git a/libswresample/swresample.h b/libswresample/swresample.h index f72715b152..bd45edc674 100644 --- a/libswresample/swresample.h +++ b/libswresample/swresample.h @@ -55,9 +55,10 @@ int swr_init(struct SwrContext *s); * @see swr_init(),swr_free() * @return NULL on error */ -struct 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); +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); /** * Free the given SwrContext. -- cgit v1.2.3