[FFmpeg-devel,2/2] avcodec/internal: increase FF_SANE_NB_CHANNELS to 256

Submitted by Marton Balint on July 3, 2018, 10:51 a.m.

Details

Message ID 20180703105112.14814-2-cus@passwd.hu
State New
Headers show

Commit Message

Marton Balint July 3, 2018, 10:51 a.m.
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>
---
 libavcodec/internal.h | 2 +-
 libavcodec/version.h  | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

Comments

Marton Balint July 13, 2018, 8:57 p.m.
On Tue, 3 Jul 2018, Marton Balint wrote:

> This was reduced from 128 in libav commit
> 192f1984b1a93aa08af053b8f9ab4950f307bd5d, but since we support unknown channel
> layouts, we can increase this limit.
>
> Fixes ticket #6332.

Applied. Might make sense to increase SWR_CH_MAX in 
libswresample/swresample_internal.h in the future as well.

Regards,
Marton

Patch hide | download patch | download mbox

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 39be9d530e..9f6b0dfe24 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -29,7 +29,7 @@ 
 
 #define LIBAVCODEC_VERSION_MAJOR  58
 #define LIBAVCODEC_VERSION_MINOR  20
-#define LIBAVCODEC_VERSION_MICRO 104
+#define LIBAVCODEC_VERSION_MICRO 105
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \