summaryrefslogtreecommitdiff
path: root/libswresample/swresample.h
diff options
context:
space:
mode:
authorClément Bœsch <ubitux@gmail.com>2011-11-04 18:54:01 +0100
committerClément Bœsch <ubitux@gmail.com>2011-11-04 19:40:32 +0100
commitf5cd136f2bcdb69abbd5b8335b247be41259da31 (patch)
tree14cf22ac81fd14ef0c89a2ba49cb7705fc9fbd6c /libswresample/swresample.h
parent682e0eaf148db9479bedb981910aea21ad1827dd (diff)
downloadffmpeg-f5cd136f2bcdb69abbd5b8335b247be41259da31.tar.gz
ffmpeg: add -map_channel option.
Based on an initial work by Baptiste Coudurier.
Diffstat (limited to 'libswresample/swresample.h')
-rw-r--r--libswresample/swresample.h4
1 files changed, 2 insertions, 2 deletions
diff --git a/libswresample/swresample.h b/libswresample/swresample.h
index d6aca219fe..f72715b152 100644
--- a/libswresample/swresample.h
+++ b/libswresample/swresample.h
@@ -25,7 +25,7 @@
#include "libavutil/samplefmt.h"
#define LIBSWRESAMPLE_VERSION_MAJOR 0
-#define LIBSWRESAMPLE_VERSION_MINOR 1
+#define LIBSWRESAMPLE_VERSION_MINOR 2
#define LIBSWRESAMPLE_VERSION_MICRO 0
#define SWR_CH_MAX 16
@@ -57,7 +57,7 @@ int swr_init(struct SwrContext *s);
*/
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,
- int log_offset, void *log_ctx);
+ const int *channel_map, int log_offset, void *log_ctx);
/**
* Free the given SwrContext.