diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 00:54:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-17 00:54:39 +0200 |
| commit | 8250943febe951824252d0f5b1e77b076544cbd3 (patch) | |
| tree | 3606bab01c9a751e43134144013e13d8aa1996e9 /libavfilter | |
| parent | c8ec2109f9b3343204f28859ad101249d716b8a8 (diff) | |
| parent | ed5d62e509bf557764848c05931417b0cd60d4b3 (diff) | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavfi/af_pan: Support a maximum of 64 channels.
lswr: Allow 64 channels internally.
lavc: Allow 64 channels internally.
Merged-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/af_pan.c | 2 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/af_pan.c b/libavfilter/af_pan.c index 4ba77a7366..9117cc09c9 100644 --- a/libavfilter/af_pan.c +++ b/libavfilter/af_pan.c @@ -37,7 +37,7 @@ #include "formats.h" #include "internal.h" -#define MAX_CHANNELS 63 +#define MAX_CHANNELS 64 typedef struct PanContext { const AVClass *class; diff --git a/libavfilter/version.h b/libavfilter/version.h index 618c626683..dead46e943 100644 --- a/libavfilter/version.h +++ b/libavfilter/version.h @@ -31,7 +31,7 @@ #define LIBAVFILTER_VERSION_MAJOR 5 #define LIBAVFILTER_VERSION_MINOR 22 -#define LIBAVFILTER_VERSION_MICRO 100 +#define LIBAVFILTER_VERSION_MICRO 101 #define LIBAVFILTER_VERSION_INT AV_VERSION_INT(LIBAVFILTER_VERSION_MAJOR, \ LIBAVFILTER_VERSION_MINOR, \ |