From 7f0d5401885b111ac9bb5e96d4fcb080bda83745 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Fri, 17 Jul 2015 00:16:45 +0200
Subject: [PATCH 1/3] lavc: Allow 64 channels internally.

---
 libavcodec/internal.h | 2 +-
 libavcodec/version.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index cea5355380..f3dafc0cd1 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -65,7 +65,7 @@
 #define FF_DEFAULT_QUANT_BIAS 999999
 #endif
 
-#define FF_SANE_NB_CHANNELS 63U
+#define FF_SANE_NB_CHANNELS 64U
 
 #define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)
 
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 778293af00..07b1ae30db 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 56
 #define LIBAVCODEC_VERSION_MINOR  49
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \

From a77401e1f712d17f3e07112fbf4b3b94abcf7a88 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Fri, 17 Jul 2015 00:17:08 +0200
Subject: [PATCH 2/3] lswr: Allow 64 channels internally.

---
 libswresample/swresample_internal.h | 2 +-
 libswresample/version.h             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libswresample/swresample_internal.h b/libswresample/swresample_internal.h
index e36faf117d..ce5eef4d9f 100644
--- a/libswresample/swresample_internal.h
+++ b/libswresample/swresample_internal.h
@@ -25,7 +25,7 @@
 #include "libavutil/channel_layout.h"
 #include "config.h"
 
-#define SWR_CH_MAX 32
+#define SWR_CH_MAX 64
 
 #define SQRT3_2      1.22474487139158904909  /* sqrt(3/2) */
 
diff --git a/libswresample/version.h b/libswresample/version.h
index 94ac9c52d0..cc0a77de28 100644
--- a/libswresample/version.h
+++ b/libswresample/version.h
@@ -30,7 +30,7 @@
 
 #define LIBSWRESAMPLE_VERSION_MAJOR   1
 #define LIBSWRESAMPLE_VERSION_MINOR   2
-#define LIBSWRESAMPLE_VERSION_MICRO 100
+#define LIBSWRESAMPLE_VERSION_MICRO 101
 
 #define LIBSWRESAMPLE_VERSION_INT  AV_VERSION_INT(LIBSWRESAMPLE_VERSION_MAJOR, \
                                                   LIBSWRESAMPLE_VERSION_MINOR, \

From ed5d62e509bf557764848c05931417b0cd60d4b3 Mon Sep 17 00:00:00 2001
From: Carl Eugen Hoyos <cehoyos@ag.or.at>
Date: Fri, 17 Jul 2015 00:17:38 +0200
Subject: [PATCH 3/3] lavfi/af_pan: Support a maximum of 64 channels.

The Soundflower input device supports 64 channels.
---
 libavfilter/af_pan.c  | 2 +-
 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, \