[FFmpeg-cvslog] avcodec/internal: increase FF_SANE_NB_CHANNELS to 256

Marton Balint git at videolan.org
Fri Jul 13 23:50:33 EEST 2018


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Tue Jul  3 12:10:54 2018 +0200| [3e0f3be2b027ce2be1ed0f25651286f4f42123d5] | committer: Marton Balint

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 at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3e0f3be2b027ce2be1ed0f25651286f4f42123d5
---

 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 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, \



More information about the ffmpeg-cvslog mailing list