aboutsummaryrefslogtreecommitdiffstats
path: root/libswresample/swresample.h
diff options
context:
space:
mode:
authorNicolas George <nicolas.george@normalesup.org>2012-02-16 11:26:32 +0100
committerNicolas George <nicolas.george@normalesup.org>2012-02-20 20:46:35 +0100
commit560b224f53fd553262790216d18c64665ebf436d (patch)
tree74c87cf7cc43391b7517c001b980856a2ea95bbc /libswresample/swresample.h
parent016c7bb762edded8d64f986e40b6f4cd739dd597 (diff)
downloadffmpeg-560b224f53fd553262790216d18c64665ebf436d.tar.gz
libswr: allow to set custom matrices.
Diffstat (limited to 'libswresample/swresample.h')
-rw-r--r--libswresample/swresample.h13
1 files changed, 12 insertions, 1 deletions
diff --git a/libswresample/swresample.h b/libswresample/swresample.h
index 8dc4e1f348..4a3f451aba 100644
--- a/libswresample/swresample.h
+++ b/libswresample/swresample.h
@@ -30,7 +30,7 @@
#include "libavutil/samplefmt.h"
#define LIBSWRESAMPLE_VERSION_MAJOR 0
-#define LIBSWRESAMPLE_VERSION_MINOR 6
+#define LIBSWRESAMPLE_VERSION_MINOR 7
#define LIBSWRESAMPLE_VERSION_MICRO 100
#define LIBSWRESAMPLE_VERSION_INT AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
@@ -127,6 +127,17 @@ int swr_set_compensation(struct SwrContext *s, int sample_delta, int compensatio
int swr_set_channel_mapping(struct SwrContext *s, const int *channel_map);
/**
+ * Set a customized remix matrix.
+ *
+ * @param s allocated Swr context, not yet initialized
+ * @param matrix remix coefficients; matrix[i + stride * o] is
+ * the weight of input channel i in output channel o
+ * @param stride offset between lines of the matrix
+ * @return AVERROR error code in case of failure.
+ */
+int swr_set_matrix(struct SwrContext *s, const double *matrix, int stride);
+
+/**
* Return the LIBSWRESAMPLE_VERSION_INT constant.
*/
unsigned swresample_version(void);