[FFmpeg-cvslog] flac: add channel layout masks for streams with 7 or 8 channels

[Tim Walker]

ffmpeg | branch: master | Tim Walker <tdskywalker at gmail.com> | Wed Feb  6 12:53:15 2013 +0000| [7af876a93fa8d88818b3e5d0bb27d9afeee3d814] | committer: Paul B Mahol

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

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=7af876a93fa8d88818b3e5d0bb27d9afeee3d814
---

 libavcodec/flac.c    |    6 ++++--
 libavcodec/version.h |    2 +-
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/libavcodec/flac.c b/libavcodec/flac.c
index f767f6b..a79a809 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)
diff --git a/libavcodec/version.h b/libavcodec/version.h
index 3f69494..01ce0ea 100644
--- a/libavcodec/version.h
+++ b/libavcodec/version.h
@@ -30,7 +30,7 @@
 
 #define LIBAVCODEC_VERSION_MAJOR 54
 #define LIBAVCODEC_VERSION_MINOR 91
-#define LIBAVCODEC_VERSION_MICRO 100
+#define LIBAVCODEC_VERSION_MICRO 101
 
 #define LIBAVCODEC_VERSION_INT  AV_VERSION_INT(LIBAVCODEC_VERSION_MAJOR, \
                                                LIBAVCODEC_VERSION_MINOR, \