diff options
| author | Clément Bœsch <ubitux@gmail.com> | 2011-11-16 19:43:58 +0100 |
|---|---|---|
| committer | Clément Bœsch <ubitux@gmail.com> | 2011-11-17 10:16:07 +0100 |
| commit | 645c61fb2b9e434768a59f3c52f093d726061d95 (patch) | |
| tree | 20e6442056ba28ef1c28df578373db302a1f8150 /libswresample/swresample.h | |
| parent | c4deb90cfaf7ef64bb80216ca1aa95db95a6f521 (diff) | |
| download | ffmpeg-645c61fb2b9e434768a59f3c52f093d726061d95.tar.gz | |
swr: rename swr_alloc2() to swr_alloc_set_opts().
Diffstat (limited to 'libswresample/swresample.h')
| -rw-r--r-- | libswresample/swresample.h | 7 |
1 files changed, 4 insertions, 3 deletions
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. |