Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'
authorHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:40:24 +0000 (10:40 +0200)
committerHendrik Leppkes <h.leppkes@gmail.com>
Mon, 24 Aug 2015 08:40:24 +0000 (10:40 +0200)
commitfd2977d85f42140c0159fdcb343fafd9f6e9098c
treec5ef931e2b6de056b552b5abce801e9da4417f47
parentd2d6ca6f98ccb4a7c51fc4f45882e2461df6e1fc
parente23f84d9652474353d8bbc42787a56ec1991908f
Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
libavutil/channel_layout.c
libavutil/channel_layout.h