Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'

* commit 'e23f84d9652474353d8bbc42787a56ec1991908f':
  channel_layout: Add a 16channel default layout

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>

diff --cc libavutil/channel_layout.c
index cd5cf426d4f1a901635d977810fe5775bd141ef6,41340ecdb6969e88a729b4320da4432adc228499..f72b2cf00c512e886fe0aaa0dd88dbed8324b4a6
--- 1/libavutil/channel_layout.c
--- 2/libavutil/channel_layout.c
+++ b/libavutil/channel_layout.c
@@@ -99,17 -94,15 +99,18 @@@ static const struct 
      { "7.0",         7,  AV_CH_LAYOUT_7POINT0 },
      { "7.0(front)",  7,  AV_CH_LAYOUT_7POINT0_FRONT },
      { "7.1",         8,  AV_CH_LAYOUT_7POINT1 },
 -    { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE },
      { "7.1(wide)",   8,  AV_CH_LAYOUT_7POINT1_WIDE_BACK },
 +    { "7.1(wide-side)",   8,  AV_CH_LAYOUT_7POINT1_WIDE },
      { "octagonal",   8,  AV_CH_LAYOUT_OCTAGONAL },
+     { "hexadecagonal", 16, AV_CH_LAYOUT_HEXADECAGONAL },
      { "downmix",     2,  AV_CH_LAYOUT_STEREO_DOWNMIX, },
 -    { 0 }
  };
  
 +#if FF_API_GET_CHANNEL_LAYOUT_COMPAT
 +static uint64_t get_channel_layout_single(const char *name, int name_len, int compat)
 +#else
  static uint64_t get_channel_layout_single(const char *name, int name_len)
 +#endif
  {
      int i;
      char *end;

diff --cc libavutil/channel_layout.h
Simple merge