From 7af876a93fa8d88818b3e5d0bb27d9afeee3d814 Mon Sep 17 00:00:00 2001 From: Tim Walker Date: Wed, 6 Feb 2013 12:53:15 +0000 Subject: flac: add channel layout masks for streams with 7 or 8 channels They were added to the latest FLAC specification: https://git.xiph.org/?p=flac-website.git;a=commit;h=65c199a2 --- libavcodec/flac.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavcodec/flac.c') diff --git a/libavcodec/flac.c b/libavcodec/flac.c index f767f6b367..a79a80964d 100644 --- a/libavcodec/flac.c +++ b/libavcodec/flac.c @@ -29,13 +29,15 @@ static const int8_t sample_size_table[] = { 0, 8, 12, 0, 16, 20, 24, 0 }; -static const int64_t flac_channel_layouts[6] = { +static const uint64_t flac_channel_layouts[8] = { AV_CH_LAYOUT_MONO, AV_CH_LAYOUT_STEREO, AV_CH_LAYOUT_SURROUND, AV_CH_LAYOUT_QUAD, AV_CH_LAYOUT_5POINT0, - AV_CH_LAYOUT_5POINT1 + AV_CH_LAYOUT_5POINT1, + AV_CH_LAYOUT_6POINT1, + AV_CH_LAYOUT_7POINT1 }; static int64_t get_utf8(GetBitContext *gb) -- cgit v1.2.1