diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-24 10:40:24 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-08-24 10:40:24 +0200 |
| commit | fd2977d85f42140c0159fdcb343fafd9f6e9098c (patch) | |
| tree | c5ef931e2b6de056b552b5abce801e9da4417f47 /libavutil | |
| parent | d2d6ca6f98ccb4a7c51fc4f45882e2461df6e1fc (diff) | |
| parent | e23f84d9652474353d8bbc42787a56ec1991908f (diff) | |
Merge commit 'e23f84d9652474353d8bbc42787a56ec1991908f'
* commit 'e23f84d9652474353d8bbc42787a56ec1991908f':
channel_layout: Add a 16channel default layout
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'libavutil')
| -rw-r--r-- | libavutil/channel_layout.c | 1 | ||||
| -rw-r--r-- | libavutil/channel_layout.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libavutil/channel_layout.c b/libavutil/channel_layout.c index cd5cf426d4..f72b2cf00c 100644 --- a/libavutil/channel_layout.c +++ b/libavutil/channel_layout.c @@ -102,6 +102,7 @@ static const struct { { "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, }, }; diff --git a/libavutil/channel_layout.h b/libavutil/channel_layout.h index dea4d6093d..ec7effead1 100644 --- a/libavutil/channel_layout.h +++ b/libavutil/channel_layout.h @@ -108,6 +108,7 @@ #define AV_CH_LAYOUT_7POINT1_WIDE (AV_CH_LAYOUT_5POINT1|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) #define AV_CH_LAYOUT_7POINT1_WIDE_BACK (AV_CH_LAYOUT_5POINT1_BACK|AV_CH_FRONT_LEFT_OF_CENTER|AV_CH_FRONT_RIGHT_OF_CENTER) #define AV_CH_LAYOUT_OCTAGONAL (AV_CH_LAYOUT_5POINT0|AV_CH_BACK_LEFT|AV_CH_BACK_CENTER|AV_CH_BACK_RIGHT) +#define AV_CH_LAYOUT_HEXADECAGONAL (AV_CH_LAYOUT_OCTAGONAL|AV_CH_WIDE_LEFT|AV_CH_WIDE_RIGHT|AV_CH_TOP_BACK_LEFT|AV_CH_TOP_BACK_RIGHT|AV_CH_TOP_BACK_CENTER|AV_CH_TOP_FRONT_CENTER|AV_CH_TOP_FRONT_LEFT|AV_CH_TOP_FRONT_RIGHT) #define AV_CH_LAYOUT_STEREO_DOWNMIX (AV_CH_STEREO_LEFT|AV_CH_STEREO_RIGHT) enum AVMatrixEncoding { |