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 | |
| parent | c8ec2109f9b3343204f28859ad101249d716b8a8 (diff) | |
| parent | ed5d62e509bf557764848c05931417b0cd60d4b3 (diff) | |
| download | ffmpeg-8250943febe951824252d0f5b1e77b076544cbd3.tar.gz | |
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>
| -rw-r--r-- | libavcodec/internal.h | 2 | ||||
| -rw-r--r-- | libavcodec/version.h | 2 | ||||
| -rw-r--r-- | libavfilter/af_pan.c | 2 | ||||
| -rw-r--r-- | libavfilter/version.h | 2 | ||||
| -rw-r--r-- | libswresample/swresample_internal.h | 2 | ||||
| -rw-r--r-- | libswresample/version.h | 2 |
6 files changed, 6 insertions, 6 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, \ 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, \ 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, \ |