Merge commit 'c5fcdb440237f06f6c954185ab60970cabf786a2'

[ffmpeg] / libavcodec / flac.c

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index f767f6b367cd3db5557432a31204d0e891cb88a8..a79a80964df0a6c5185b6a1a2f1112ca1355bc50 100644 (file)
--- 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)