summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2018-07-03 12:10:54 +0200
committerMarton Balint <cus@passwd.hu>2018-07-13 22:24:33 +0200
commit3e0f3be2b027ce2be1ed0f25651286f4f42123d5 (patch)
tree09347645dfbae1b7ac9a4bec6ca695af44affd14
parent5982078e8d56b84de4d538ab4d39f474b833cdc2 (diff)
downloadffmpeg-3e0f3be2b027ce2be1ed0f25651286f4f42123d5.tar.gz
avcodec/internal: increase FF_SANE_NB_CHANNELS to 256
This was reduced from 128 in libav commit 192f1984b1a93aa08af053b8f9ab4950f307bd5d, but since we support unknown channel layouts, we can increase this limit. Fixes ticket #6332. Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--libavcodec/internal.h2
-rw-r--r--libavcodec/version.h2
2 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/internal.h b/libavcodec/internal.h
index bb92873d7b..0c2133f092 100644
--- a/libavcodec/internal.h
+++ b/libavcodec/internal.h
@@ -83,7 +83,7 @@
#define FF_QSCALE_TYPE_H264 2
#define FF_QSCALE_TYPE_VP56 3
-#define FF_SANE_NB_CHANNELS 64U
+#define FF_SANE_NB_CHANNELS 256U
#define FF_SIGNBIT(x) ((x) >> CHAR_BIT * sizeof(x) - 1)
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 471ea4a8ab..7139c1f557 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@
#define LIBAVCODEC_VERSION_MAJOR 58
#define LIBAVCODEC_VERSION_MINOR 21
-#define LIBAVCODEC_VERSION_MICRO 104
+#define LIBAVCODEC_VERSION_MICRO 105
#define LIBAVCODEC_VERSION_INT AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
LIBAVCODEC_VERSION_MINOR, \